Changeset 20282 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Jun 4, 2009 1:21:19 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

48161

Message:

libs/xpcom: fix race for EventQueueService singleton creation, which causes the client to be unresponsive to requests from VBoxSVC, causing lots of trouble. Also a few other minor bugfixes which can lead to crashes.

Location:

trunk/src/libs/xpcom18a4

Files:

• ipc/ipcd/daemon/src/ipcdUnix.cpp (modified) (1 diff)
• nsprpub/pr/src/md/unix/uxproces.c (modified) (1 diff)
• xpcom/build/nsXPComInit.cpp (modified) (2 diffs)

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

@@ -525 +525 @@
         IPC_InitModuleReg(argv[0]);
 
+#ifdef VBOX
+        // Use large backlog, as otherwise local sockets can reject connection
+        // attempts. Usually harmless, but causes an unnecessary start attempt
+        // of IPCD (which will terminate straight away), and the next attempt
+        // usually succeeds. But better avoid unnecessary activities.
+        if (PR_Listen(listenFD, 128) != PR_SUCCESS) {
+#else /* !VBOX */
         if (PR_Listen(listenFD, 5) != PR_SUCCESS) {
+#endif /* !VBOX */
             LOG(("PR_Listen failed [%d]\n", PR_GetError()));
         }

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxproces.c

@@ -619 +619 @@
         InsertPidTable(pRec);
     } else {
+#ifdef VBOX
+        /* In the context of VirtualBox processes get created (right now
+         * exclusively via Machine::openRemoteSession) which xpcom doesn't know
+         * about, and thus would trigger assertions or (even worse) could
+         * crash VBoxSVC as the code below would notify a NULL condition
+         * variable. Treat it like a detached process. The proper fix would be
+         * to port the NSPR to use IPRT, as currently this races with getting
+         * the exit code, but that's pretty harmless. */
+        /** @todo fix this properly, by using IPRT for process management */
+        if (_PR_PID_REAPED == pRec->state) {
+            DeletePidTable(pRec);
+            PR_DELETE(pRec);
+        } else
+#else /* !VBOX */
         PR_ASSERT(pRec->state != _PR_PID_REAPED);
+#endif /* !VBOX */
         if (_PR_PID_DETACHED == pRec->state) {
             PR_ASSERT(NULL == pRec->reapedCV);

trunk/src/libs/xpcom18a4/xpcom/build/nsXPComInit.cpp

@@ -69 +69 @@
 #include "nsEventQueueService.h"
 #include "nsEventQueue.h"
+#ifdef VBOX
+# include "nsEventQueueUtils.h"
+#endif /* VBOX */
 
 #include "nsIProxyObjectManager.h"
@@ -761 +764 @@
     nsIInterfaceInfoManager* iim = XPTI_GetInterfaceInfoManager();
     NS_IF_RELEASE(iim);
+#ifdef VBOX
+    // Must initialize the EventQueueService singleton before anyone is
+    // using it. The notification below creates a thread which races creating
+    // the EventQueueService creation otherwise, no matter what.
+    nsCOMPtr<nsIEventQueue> eventQ;
+    rv = NS_GetMainEventQ(getter_AddRefs(eventQ));
+    if (NS_FAILED(rv)) {
+      NS_ERROR("Could not create event queue for main thread");
+      return rv;
+    }
+#endif /* VBOX */
 
     // Notify observers of xpcom autoregistration start