Changeset 9197 for trunk/src/apps/ucache/ucached.c

Timestamp:

02/17/12 17:05:04 (16 months ago)

Author:

denton

Message:

Corrected bugs related to piped info between the ucache daemon and its client.

Files:

• trunk/src/apps/ucache/ucached.c (modified) (12 diffs)

trunk/src/apps/ucache/ucached.c

@@ -48 +48 @@
     else
     {
-        strcpy(buffer, "FAILURE: check log:" UCACHED_LOG_FILE);
+        strcpy(buffer, "FAILURE: check log: " UCACHED_LOG_FILE);
     }
 }
@@ -80 +80 @@
  * handled. 
  * Returns -1 when 1 or more  hung locks are detected and couldn't
- * be handled properly. (error) 
+* be handled properly. (error) 
  */
 static int ucached_lockchk(void)
@@ -179 +179 @@
             break;
         case 'i':
-            rc = ucache_info(stdout, "sav");
+        {
+            char info_options[6];
+            memset(info_options, 0, 6);
+
+            /* Open FILE * to output ucache_info */
+            FILE * info_out = fopen(UCACHED_INFO_FILE, "w");
+            //FILE * info_out = fdopen(writefd, "w");
+
+            int howmany = sscanf(&buffer[1], "%s", info_options);
+            if(howmany > 0)
+            {
+                rc = ucache_info(info_out, info_options);
+            }
+            else
+            {
+                fprintf(info_out, "No display options specified. " 
+                    "Showing all ucache contents.\n");
+                rc = ucache_info(info_out, "a");
+            }
+            rc = 1;
+            fclose(info_out);
+            //shmdt(ucache);
+            //shmdt(ucache_aux);
             break;
+        }
         /* Close Daemon */
         case 'x': 
@@ -190 +213 @@
             }
             close(writefd);
+            close(readfd);
             exit(EXIT_SUCCESS);
             break;
         default:
             strcpy(buffer, "FAILURE\tInvalid command character");
-            break;
-     }
+            return -1;
+    }
     return rc;
 }
@@ -475 +499 @@
     if(dest_ucache)
     {
+//        printf("dest_ucache\n");
         gossip_debug(GOSSIP_UCACHED_DEBUG,
             "INFO: destroying ucache shmem\n");
@@ -499 +524 @@
     if(dest_locks)
     {
+//        printf("dest_locks\n");
         gossip_debug(GOSSIP_UCACHED_DEBUG,
             "INFO: destroying locks' shmem\n");
@@ -523 +549 @@
     gossip_debug(GOSSIP_UCACHED_DEBUG,
         "INFO: both shmem segments marked for destruction.\n");
-
     return rc;
 }
@@ -576 +601 @@
 
     /* Daemonize! */
-    rc = daemon(0, 0);
+    //rc = daemon( 0, 0);
+    rc = daemon( 1, 1);
 
     if(rc != 0)
@@ -645 +671 @@
                 char c = buffer[0];
                 /* Valid Command? */
-                if(c == 'c' || c == 'd' || c == 'x' || 'i')
+                if(c == 'c' || c == 'd' || c == 'x' || c == 'i')
                 {
                     gossip_debug(GOSSIP_UCACHED_DEBUG,
                         "INFO: Command Received: %c\n", c);
-                    /* Run creation in child process */
-                    if(c == 'c')
+                    if(c == 'c' || c == 'i')
                     {
+                        /* Run creation in child process */
                         run_as_child(c);
                     }
                     else
                     {
-                        rc = execute_cmd(c);
+                        execute_cmd(c);
                     }
-                    check_rc(rc);                  
+                    check_rc(rc);
                 }
                 /* Invalid Command */
@@ -670 +696 @@
 
                 /* Data can be written, not guaranteed anything to write */
-                int responseLength = 0;
-                if((responseLength = strlen(buffer)) != 0)
+                int responseLength = strlen(buffer);
+                if(responseLength != 0)
                 {
                     writefd = open(FIFO2, O_WRONLY);
                     if(writefd == -1)
-                    {
+                    {   perror("Error Opening File");
                         gossip_debug(GOSSIP_UCACHED_DEBUG,
                            "ERROR: opening write FIFO: errno = %d\n", errno);
@@ -681 +707 @@
                     rc = write(writefd, buffer, BUFF_SIZE);
                     while(rc <= 0)
-                    {
+                    {   printf("rc = %d\n", rc);
                         rc = write(writefd, buffer, BUFF_SIZE);
                     }
                     memset(buffer, 0, BUFF_SIZE);
-                    close(writefd);
                 }
+                else
+                {
+                    printf("no response\n");
+                }
             }
         }
@@ -693 +722 @@
         if(ucache_avail)
         {
-            /* Gather stats */
-            /* TODO: which stats? */
+            /* TODO: write some stats to file periodically */
 
             /* Write some dirty blocks out */
-            /* TODO: create function to do this or do i already have one that will suffice? */
+            /* TODO: create function to do this. */
 
             /* Check for hung locks */