Changeset 47475 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Jul 30, 2013 2:18:02 PM (11 years ago)

Author:

vboxsync

Message:

VBoxService/GuestCtrl: Forward ported r87539 + r87613 (4.2: VBoxService/VBoxServiceControlThread: (Another) fix for guest process timeout / pipe handling.).

File:

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

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

@@ -718 +718 @@
             {
                 fProcessAlive = false;
-                continue;
-            }
-            if (RT_UNLIKELY(rc2 == VERR_INTERRUPTED))
-                continue;
-            if (RT_UNLIKELY(rc2 == VERR_PROCESS_NOT_FOUND))
-            {
-                fProcessAlive = false;
-                ProcessStatus.enmReason = RTPROCEXITREASON_ABEND;
-                ProcessStatus.iStatus   = 255;
-                AssertFailed();
+                /* Note: Don't bail out here yet. First check in the next block below
+                 *       if all needed pipe outputs have been consumed. */
             }
             else
-                AssertMsg(rc2 == VERR_PROCESS_RUNNING, ("%Rrc\n", rc2));
+            {
+                if (RT_UNLIKELY(rc2 == VERR_INTERRUPTED))
+                    continue;
+                if (RT_UNLIKELY(rc2 == VERR_PROCESS_NOT_FOUND))
+                {
+                    fProcessAlive = false;
+                    ProcessStatus.enmReason = RTPROCEXITREASON_ABEND;
+                    ProcessStatus.iStatus   = 255;
+                    AssertFailed();
+                }
+                else
+                    AssertMsg(rc2 == VERR_PROCESS_RUNNING, ("%Rrc\n", rc2));
+            }
         }
 
@@ -737 +741 @@
          * we should be heading out.
          */
-        if (   !fProcessAlive
-            && *phStdOutR == NIL_RTPIPE
-            && *phStdErrR == NIL_RTPIPE)
-        {
-            VBoxServiceVerbose(3, "[PID %RU32]: All pipes closed, process not alive anymore, bailing out ...\n",
-                                   pProcess->uPID);
-            break;
+        if (!fProcessAlive)
+        {
+            if (   fProcessTimedOut
+                || (   *phStdOutR == NIL_RTPIPE
+                    && *phStdErrR == NIL_RTPIPE)
+               )
+            {
+                break;
+            }
         }
 
@@ -757 +763 @@
             if (cMsElapsed >= pProcess->StartupInfo.uTimeLimitMS)
             {
-                VBoxServiceVerbose(3, "[PID %RU32]: Timed out (%RU32ms elapsed > %RU32ms timeout), killing ...\n",
+                VBoxServiceVerbose(3, "[PID %RU32]: Timed out (%RU64ms elapsed > %RU64ms timeout), killing ...\n",
                                    pProcess->uPID, cMsElapsed, pProcess->StartupInfo.uTimeLimitMS);
 
@@ -766 +772 @@
                     if (u64Now - MsProcessKilled > 20*60*1000)
                         break; /* Give up after 20 mins. */
-                    RTProcTerminate(hProcess);
+                    rc2 = RTProcTerminate(hProcess);
+                    VBoxServiceVerbose(3, "[PID %RU32]: Killing process resulted in rc=%Rrc\n",
+                                       pProcess->uPID, rc2);
                     MsProcessKilled = u64Now;
                     continue;
@@ -784 +792 @@
     }
 
-    VBoxServiceVerbose(2, "[PID %RU32]: Process loop ended with rc=%Rrc\n",
-                       pProcess->uPID, rc);
+    VBoxServiceVerbose(3, "[PID %RU32]: Loop ended: fShutdown=%RTbool, fProcessAlive=%RTbool, fProcessTimedOut=%RTbool, MsProcessKilled=%RU32\n",
+                       pProcess->uPID, pProcess->fShutdown, fProcessAlive, fProcessTimedOut, MsProcessKilled, MsProcessKilled);
+    VBoxServiceVerbose(3, "[PID %RU32]: *phStdOutR=%s, *phStdErrR=%s\n",
+                       pProcess->uPID, *phStdOutR == NIL_RTPIPE ? "closed" : "open", *phStdErrR == NIL_RTPIPE ? "closed" : "open");
 
     /* Signal that this thread is in progress of shutting down. */