Changeset 39428 in vbox

Timestamp:

Nov 25, 2011 4:18:40 PM (13 years ago)

Author:

vboxsync

Message:

review change.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -55 +55 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-/** @todo Shorten "VBoxServiceControl" to "vbgsvcCntl". */
+/** @todo Shorten "VBoxServiceControl" to "gstsvcCntl". */
 static int VBoxServiceControlStartAllowed(bool *pbAllowed);
 static int VBoxServiceControlHandleCmdStartProc(uint32_t u32ClientId, uint32_t uNumParms);
@@ -814 +814 @@
          * not used anymore. */
         PVBOXSERVICECTRLTHREAD pThreadCur;
-        RTListForEach(&g_GuestControlThreads, pThreadCur, VBOXSERVICECTRLTHREAD, Node)
-        {
-            if (   pThreadCur->uPID == uPID
-                && pThreadCur       != pThread)
+        bool fTryAgain = false;
+        do
+        {
+            RTListForEach(&g_GuestControlThreads, pThreadCur, VBOXSERVICECTRLTHREAD, Node)
             {
-                VBoxServiceVerbose(2, "ControlThread: PID %u was used before, shutting down stale exec thread ...\n",
-                                   uPID);
-                rc = VBoxServiceControlThreadSignalShutdown(pThreadCur);
-                if (RT_SUCCESS(rc))
-                    rc = VBoxServiceControlThreadWaitForShutdown(pThreadCur,
-                                                                 30 * 1000 /* Wait 30 seconds max. */);
+                if (pThreadCur->uPID == uPID)
+                {
+                    Assert(pThreadCur != pThread); /* can't happen */
+                    uint32_t uTriedPID = uPID;
+                    uPID += 391939;
+                    VBoxServiceVerbose(2, "ControlThread: PID %u was used before, trying again with %u ...\n",
+                                       uTriedPID, uPID);
+                    fTryAgain = true;
+                    break;
+                }
             }
-        }
+        } while (fTryAgain);
 
         /* Assign PID to current thread. */