Changeset 47481 in vbox for trunk/src/VBox

Timestamp:

Jul 30, 2013 7:11:43 PM (11 years ago)

Author:

vboxsync

Message:

VBoxService/GuestCtrl: Don't hang on PID reuse.

File:

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

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

@@ -1366 +1366 @@
  *
  * @return  IPRT status code.
- * @param   pThread        Thread to assign PID to.
+ * @param   pProcess       Process to assign PID to.
  * @param   uPID           PID to assign to the specified guest control execution thread.
  */
-int gstcntlProcessAssignPID(PVBOXSERVICECTRLPROCESS pThread, uint32_t uPID)
-{
-    AssertPtrReturn(pThread, VERR_INVALID_POINTER);
+int gstcntlProcessAssignPID(PVBOXSERVICECTRLPROCESS pProcess, uint32_t uPID)
+{
+    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
     AssertReturn(uPID, VERR_INVALID_PARAMETER);
 
-    AssertPtr(pThread->pSession);
-    int rc = RTCritSectEnter(&pThread->pSession->CritSect);
+    AssertPtr(pProcess->pSession);
+    int rc = RTCritSectEnter(&pProcess->pSession->CritSect);
     if (RT_SUCCESS(rc))
     {
         /* Search old threads using the desired PID and shut them down completely -- it's
          * not used anymore. */
-        PVBOXSERVICECTRLPROCESS pThreadCur;
-        bool fTryAgain = false;
+        PVBOXSERVICECTRLPROCESS pProcessCur;
+        bool fTryAgain;
         do
         {
-            RTListForEach(&pThread->pSession->lstProcessesActive, pThreadCur, VBOXSERVICECTRLPROCESS, Node)
-            {
-                if (pThreadCur->uPID == uPID)
+            fTryAgain = false;
+            RTListForEach(&pProcess->pSession->lstProcessesActive, pProcessCur, VBOXSERVICECTRLPROCESS, Node)
+            {
+                if (pProcessCur->uPID == uPID)
                 {
-                    Assert(pThreadCur != pThread); /* can't happen */
+                    Assert(pProcessCur != pProcess); /* can't happen */
                     uint32_t uTriedPID = uPID;
                     uPID += 391939;
-                    VBoxServiceVerbose(2, "PID %RU32 was used before, trying again with %u ...\n",
-                                       uTriedPID, uPID);
+                    VBoxServiceVerbose(2, "PID %RU32 was used before (process %p), trying again with %RU32 ...\n",
+                                       uTriedPID, pProcessCur, uPID);
                     fTryAgain = true;
                     break;
@@ -1400 +1401 @@
 
         /* Assign PID to current thread. */
-        pThread->uPID = uPID;
-
-        rc = RTCritSectLeave(&pThread->pSession->CritSect);
+        pProcess->uPID = uPID;
+
+        rc = RTCritSectLeave(&pProcess->pSession->CritSect);
         AssertRC(rc);
     }