Changeset 15604 in vbox for trunk/src/VBox/Main

Timestamp:

Dec 16, 2008 7:20:17 PM (16 years ago)

Author:

vboxsync

Message:

Main: #3400: Fixed a race between the VBoxSVC shutdown timer and clients wanting new objects.

Location:

trunk/src/VBox/Main/xpcom

Files:

• server.cpp (modified) (8 diffs)
• server_module.cpp (modified) (3 diffs)

trunk/src/VBox/Main/xpcom/server.cpp

@@ -338 +338 @@
 
         FinalRelease();
-        sInstance = 0;
+        sInstance = NULL;
 
         LogFlowFunc (("VirtualBox object deleted.\n"));
@@ -362 +362 @@
             PRBool timerStarted = PR_FALSE;
 
-            /* sTimes is null if this call originates from
-             * FactoryDestructor() */
+            /* sTimer is null if this call originates from FactoryDestructor()*/
             if (sTimer != NULL)
             {
@@ -456 +455 @@
             else
             {
-                /* This condition is quite rare: a new client will have to
+                /* This condition is quite rare: a new client happened to
                  * connect after this event has been posted to the main queue
                  * but before it started to process it. */
@@ -516 +515 @@
         RTCritSectDelete (&sLock);
 
-        if (sInstance)
+        if (sInstance != NULL)
         {
             /* Either posting a destruction event falied for some reason (most
@@ -535 +534 @@
         RTCritSectEnter (&sLock);
 
-        int rv = NS_OK;
-
-        if (sInstance == 0)
+        if (!gKeepRunning)
+        {
+            LogFlowFunc (("Process termination requested first. Refusing.\n"));
+
+            RTCritSectLeave (&sLock);
+
+            /* this rv is what CreateInstance() on the client side returns
+             * when the server process stops accepting events. Do the same
+             * here. The client wrapper should attempt to start a new process in
+             * response to a failure from us. */
+            return NS_ERROR_ABORT;
+        }
+
+        nsresult rv = NS_OK;
+
+        if (sInstance == NULL)
         {
             LogFlowFunc (("Creating new VirtualBox object...\n"));
             sInstance = new VirtualBoxClassFactory();
-            if (sInstance)
+            if (sInstance != NULL)
             {
                 /* make an extra AddRef to take the full control
@@ -563 +575 @@
                     sInstance->Release();
                     sInstance->Release();
-                    Assert (sInstance == 0);
+                    Assert (sInstance == NULL);
                 }
                 else
@@ -614 +626 @@
 };
 
-VirtualBoxClassFactory *VirtualBoxClassFactory::sInstance = 0;
+VirtualBoxClassFactory *VirtualBoxClassFactory::sInstance = NULL;
 RTCRITSECT VirtualBoxClassFactory::sLock = {0};
 
@@ -1152 +1164 @@
         }
 
+        /* stop accepting new events. Clients that happen to resolve our
+         * name and issue a CreateInstance() request after this point will
+         * get NS_ERROR_ABORT once we hande the remaining messages. As a
+         * result, they should try to start a new server process. */
+        gEventQ->StopAcceptingEvents();
+
+        /* unregister ourselves. After this point, clients will start a new
+         * process because they won't be able to resolve the server name.*/
         gIpcServ->RemoveName (VBOXSVC_IPC_NAME);
 
-        /* stop accepting new events */
-        gEventQ->StopAcceptingEvents();
-
-        /* process any remaining events */
+        /* process any remaining events. These events may include
+         * CreateInstance() requests received right before we called
+         * StopAcceptingEvents() above. We will detect this case below,
+         * restore gKeepRunning and continue to serve. */
         gEventQ->ProcessPendingEvents();
 

trunk/src/VBox/Main/xpcom/server_module.cpp

@@ -229 +229 @@
                 break;
 
+            LogFlowFunc (("Failed to connect (rc=%Rhrc (%#08x))\n", rc, rc));
+
             /* It's possible that the server gets shut down after we
              * successfully resolve the server name but before it
@@ -239 +241 @@
                 if (NS_SUCCEEDED (rc2))
                     break;
+
+                LogFlowFunc (("Server seems to have terminated before "
+                              "receiving our request. Will try again.\n"));
             }
             else
@@ -247 +252 @@
     while (0);
 
-    LogFlowFunc (("rc=%08X, vrc=%Rrc\n", rc, vrc));
+    LogFlowFunc (("rc=%Rhrc (%#08x), vrc=%Rrc\n", rc, rc, vrc));
     LogFlowFuncLeave();