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

Timestamp:

Jan 24, 2011 4:16:38 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService/ControlExec: Fix for high CPU loads during writable events of started processes.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (6 diffs)

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

@@ -64 +64 @@
     {
         int rc2 = RTPollSetRemove(hPollSet, VBOXSERVICECTRLPIPEID_STDIN_WRITABLE);
-        AssertRC(rc2);
+        /* Don't assert if writable handle is not in poll set anymore. */
+        if (   RT_FAILURE(rc2)
+            && rc2 != VERR_POLL_HANDLE_ID_NOT_FOUND)
+                {
+            AssertRC(rc2);
+                }
 
         rc2 = RTPipeClose(*phStdInW);
@@ -209 +214 @@
             rc = VBoxServiceControlExecProcHandleStdInErrorEvent(hPollSet, fPollEvt, phStdInW, pStdInBuf);
         }
+        else if (!*pcbWritten)
+        {
+            /* Nothing else left to write now? Remove the writable event from the poll set
+             * to not trigger too high CPU loads. */
+            rc = RTPollSetRemove(hPollSet, VBOXSERVICECTRLPIPEID_STDIN_WRITABLE);
+            AssertRC(rc);
+        }
     }
     else
@@ -388 +400 @@
         if (RT_SUCCESS(rc2))
         {
-#ifdef DEBUG
             VBoxServiceVerbose(4, "ControlExec: RTPollNoResume idPollHnd=%u\n", idPollHnd);
-#endif
             switch (idPollHnd)
             {
@@ -402 +412 @@
                     uint8_t abBuf[8];
                     size_t cbIgnore;
-                    RTPipeRead(pData->stdIn.hNotificationPipeR, abBuf, sizeof(abBuf), &cbIgnore);
+                    rc = RTPipeRead(pData->stdIn.hNotificationPipeR, abBuf, sizeof(abBuf), &cbIgnore);
+                    if (RT_SUCCESS(rc))
+                    {
+                        /*
+                         * When the writable handle previously was removed from the poll set we need to add
+                         * it here again so that writable events from the started procecss get handled correctly.
+                         */
+                        RTHANDLE hWritableIgnored;
+                        rc = RTPollSetQueryHandle(hPollSet, VBOXSERVICECTRLPIPEID_STDIN_WRITABLE, &hWritableIgnored);
+                        if (rc == VERR_POLL_HANDLE_ID_NOT_FOUND)
+                        {
+                            rc = RTPollSetAddPipe(hPollSet, pData->pipeStdInW, RTPOLL_EVT_WRITE, VBOXSERVICECTRLPIPEID_STDIN_WRITABLE);
+                            AssertRC(rc);
+                            break;
+                        }
+                        AssertRC(rc);
+                    }
                 }
                 /* Fall through. */
@@ -632 +658 @@
 static int VBoxServiceControlExecSetupPipe(int fd, PRTHANDLE ph, PRTHANDLE *pph, PRTPIPE phPipe)
 {
-    AssertPtr(ph);
-    AssertPtr(pph);
-    AssertPtr(phPipe);
+    AssertPtrReturn(ph, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pph, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(phPipe, VERR_INVALID_PARAMETER);
 
     ph->enmType = RTHANDLETYPE_PIPE;
@@ -677 +703 @@
 static int VBoxServiceControlExecInitPipeBuffer(PVBOXSERVICECTRLEXECPIPEBUF pBuf, bool fNeedNotificationPipe)
 {
-    AssertPtr(pBuf);
+    AssertPtrReturn(pBuf, VERR_INVALID_PARAMETER);
 
     /** @todo Add allocation size as function parameter! */