Changeset 7049 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/daemon

Timestamp:

Feb 20, 2008 4:18:29 PM (17 years ago)

Author:

vboxsync

Message:

XPCOM/IPC: Cleaned up IPC daemon startup procedure (makes sure there are no incorrect failure assertions when another copy of the daemon is already running).

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp (modified) (10 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

@@ -87 +87 @@
 #endif
 
-#ifdef VBOX
-static PRBool fatal = PR_FALSE;
-#endif
-
 #ifdef IPC_USE_FILE_LOCK
 
+enum Status
+{
+    EOk = 0,
+    ELockFileOpen = -1,
+    ELockFileLock = -2,
+
+};
+
 static int ipcLockFD = 0;
 
-static PRBool AcquireDaemonLock(const char *baseDir)
+static Status AcquireDaemonLock(const char *baseDir)
 {
     const char lockName[] = "lock";
@@ -117 +121 @@
 
     if (ipcLockFD == -1)
-#ifdef VBOX
-    {
-        // cannot open file --> this is fatal
-        fatal = PR_TRUE;
-#endif
-        return PR_FALSE;
-#ifdef VBOX
-    }
-#endif
+        return ELockFileOpen;
 
     //
@@ -139 +135 @@
     lock.l_whence = SEEK_SET;
     if (fcntl(ipcLockFD, F_SETLK, &lock) == -1)
-#ifdef VBOX
-        // cannot grab file lock --> this is NOT fatal (other daemon running)
-#endif
-        return PR_FALSE;
+        return ELockFileLock;
 
     //
@@ -157 +150 @@
     write(ipcLockFD, buf, nb);
 
-    return PR_TRUE;
-}
-
-static PRBool InitDaemonDir(const char *socketPath)
+    return EOk;
+}
+
+static Status InitDaemonDir(const char *socketPath)
 {
     LOG(("InitDaemonDir [sock=%s]\n", socketPath));
@@ -178 +171 @@
     // must be active, so bail.
     //
-    PRBool haveLock = AcquireDaemonLock(baseDir);
+    Status status = AcquireDaemonLock(baseDir);
 
     PL_strfree(baseDir);
 
-    if (haveLock) {
+    if (status == EOk) {
         // delete an existing socket to prevent bind from failing.
         unlink(socketPath);
     }
-    return haveLock;
+    return status;
 }
 
@@ -402 +395 @@
     PRFileDesc *listenFD = NULL;
     PRNetAddr addr;
-#ifdef VBOX
-    enum { None=0, Directory, All } successLevel = None;
-#endif
 
     //
@@ -431 +421 @@
 
 #ifdef IPC_USE_FILE_LOCK
-    if (!InitDaemonDir(addr.local.path)) {
-        LOG(("InitDaemonDir failed\n"));
+    Status status = InitDaemonDir(addr.local.path);
+    if (status != EOk) {
+        if (status == ELockFileLock) {
+            LOG(("Another daemon is already running, exiting.\n"));
+            // send a signal to the blocked parent to indicate success
+            IPC_NotifyParent();
+            return 0;
+        }
+        else {
+            LOG(("InitDaemonDir failed (status=%d)\n", status));
+            // don't notify the parent to cause it to fail in PR_Read() after
+            // we terminate
 #ifdef VBOX
-        printf("Cannot create/open directory '%s'\n", addr.local.path);
+            printf("Cannot create a lock file for '%s'.\n"
+                   "Check permissions.\n", addr.local.path);
 #endif
-        goto end;
-    }
-#endif
-
-#ifdef VBOX
-    successLevel = Directory;
+            return 0;
+        }
+    }
 #endif
 
@@ -447 +445 @@
     if (!listenFD) {
         LOG(("PR_OpenTCPSocket failed [%d]\n", PR_GetError()));
-        goto end;
-    }
-
-    if (PR_Bind(listenFD, &addr) != PR_SUCCESS) {
+    }
+    else if (PR_Bind(listenFD, &addr) != PR_SUCCESS) {
         LOG(("PR_Bind failed [%d]\n", PR_GetError()));
-        goto end;
-    }
-
-    IPC_InitModuleReg(argv[0]);
-
-    if (PR_Listen(listenFD, 5) != PR_SUCCESS) {
-        LOG(("PR_Listen failed [%d]\n", PR_GetError()));
-        goto end;
-    }
-
-    IPC_NotifyParent();
-
-#ifdef VBOX
-    /* redirect all standard file descriptors to /dev/null for daemonizing */
-    PR_Close(PR_STDIN);
-    PR_Open("/dev/null", O_RDONLY, 0);
-    PR_Close(PR_STDOUT);
-    PR_Open("/dev/null", O_WRONLY, 0);
-    PR_Close(PR_STDERR);
-    PR_Open("/dev/null", O_WRONLY, 0);
-#endif
-
-#ifdef VBOX
-    successLevel = All;
-#endif
-
-    PollLoop(listenFD);
-
-end:
-#ifdef VBOX
-    if (successLevel >= All)
-#endif
-    IPC_ShutdownModuleReg();
-
-#ifdef VBOX
-    if (successLevel >= All)
-#endif
-    IPC_NotifyParent();
+    }
+    else {
+        IPC_InitModuleReg(argv[0]);
+
+        if (PR_Listen(listenFD, 5) != PR_SUCCESS) {
+            LOG(("PR_Listen failed [%d]\n", PR_GetError()));
+        }
+        else {
+            // redirect all standard file descriptors to /dev/null for
+            // proper daemonizing
+            PR_Close(PR_STDIN);
+            PR_Open("/dev/null", O_RDONLY, 0);
+            PR_Close(PR_STDOUT);
+            PR_Open("/dev/null", O_WRONLY, 0);
+            PR_Close(PR_STDERR);
+            PR_Open("/dev/null", O_WRONLY, 0);
+
+            IPC_NotifyParent();
+
+            PollLoop(listenFD);
+        }
+
+        IPC_ShutdownModuleReg();
+    }
 
     //IPC_Sleep(5);
@@ -498 +480 @@
     // to acquire the lock and would then leave the client without a daemon.
 
-#ifdef VBOX
-    if (successLevel >= Directory)
-#endif
     ShutdownDaemonDir();
 #endif
@@ -509 +488 @@
     }
 
-#ifdef VBOX
-    if (successLevel < All)
-    {
-        if (fatal)
-        {
-            /* Kill the parent which spawned us */
-            printf("Abnormal termination.\n");
-            kill(getppid(), SIGINT);
-        }
-    }
-#endif
-
     return 0;
 }