Changeset 9238

Timestamp:

03/13/12 17:12:28 (14 months ago)

Author:

walt

Message:

updates to ucache code

Location:

branches/stable/src/apps/ucache

Files:

• ucached.c (modified) (3 diffs)
• ucached.h (modified) (1 diff)

branches/stable/src/apps/ucache/ucached.c

@@ -212 +212 @@
                 rc = write(writefd, "SUCCESS\tExiting ucached", BUFF_SIZE);
             }
+            remove(UCACHED_STARTED);
             close(writefd);
             close(readfd);
@@ -558 +559 @@
 {
     int rc = 0; 
-    void *rp;
 
     gossip_enable_file(UCACHED_LOG_FILE, "a");
@@ -576 +576 @@
     {
         out = stdout;
-    }
-
-    /* Continue ucached if it's the only ucached */
-    char ps_buff1[256];
-    char ps_buff2[256];
-    FILE *pipe = popen("ps -e | grep -w ucached", "r");
-
-    /* Should catch 1 line result, but not 2 */
-    rp = fgets(ps_buff1, 256, pipe);
-    rp = fgets(ps_buff2, 256, pipe); /* Should be zero if only 1 ucached */
-    if(rp == NULL)
-    {
-        /* Remove old FIFOs in case daemon was killed last time */
-        remove(FIFO1);
-        remove(FIFO2);
-    }
-    else
-    {  
-        puts("FAILURE: Daemon already started");
-        puts(ps_buff1);
-        puts(ps_buff2);
-        exit(EXIT_FAILURE);
     }
 

branches/stable/src/apps/ucache/ucached.h

@@ -24 +24 @@
 #ifndef UCACHED_INFO_FILE
 #define UCACHED_INFO_FILE "/tmp/ucached.info"
+#endif
+
+#ifndef UCACHED_STARTED
+#define UCACHED_STARTED "/tmp/ucached.started"
 #endif