Changeset 38493 in vbox

Timestamp:

Aug 19, 2011 7:05:37 AM (14 years ago)

Author:

vboxsync

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

73587

Message:

GuestCtrl: Fixed regression when waiting for guest output.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlExec.cpp (modified) (1 diff)
• VBoxServiceControlExecThread.cpp (modified) (1 diff)
• VBoxServicePipeBuf.cpp (modified) (2 diffs)

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

@@ -248 +248 @@
         AssertRC(rc2);
         *phPipeR = NIL_RTPIPE;
+
+        /* Sinc some error occured (or because the pipe simply broke) we
+         * have to set our pipe buffer to disabled so that others don't wait
+         * for new data to arrive anymore. */
+        VBoxServicePipeBufSetStatus(pBuf, false);
     }
     return rc;

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

@@ -384 +384 @@
                 if (RT_SUCCESS(rc))
                 {
-                    if (fEnabled && !cbRead)
-                        AssertMsgFailed(("[PID %u]: Waited (%ums) for pipe buffer %u (%u bytes left), but nothing read!\n",
-                                         uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize - pPipeBuf->cbOffset));
+#if 0
+                    if (!cbRead)
+                        AssertReleaseMsg(fEnabled == VBoxServicePipeBufIsEnabled(pPipeBuf),
+                                         ("[PID %u]: Waited (%ums) for active pipe buffer %u (%u size, %u bytes left), but nothing read!\n",
+                                         uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize, pPipeBuf->cbSize - pPipeBuf->cbOffset));
+#endif
                     if (pcbRead)
                         *pcbRead = cbRead;

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

@@ -402 +402 @@
     {
         fEnabled = pBuf->fEnabled;
-        RTCritSectLeave(&pBuf->CritSect);
+        rc = RTCritSectLeave(&pBuf->CritSect);
+        AssertRC(rc);
     }
     return fEnabled;
@@ -453 +454 @@
             && pBuf->hEventSem)
         {
+#ifdef DEBUG_andy
+            VBoxServiceVerbose(4, "Pipe [%u %u] status %s -> %s\n",
+                               pBuf->uPID, pBuf->uPipeId,
+                               fEnabledOld ? "EN" : "DIS", pBuf->fEnabled ? "EN" : "DIS");
+#endif
             /* Let waiter know that something has changed ... */
             RTSemEventSignal(pBuf->hEventSem);