Changeset 38587 in vbox

Timestamp:

Aug 31, 2011 3:09:45 PM (13 years ago)

Author:

vboxsync

Message:

VBoxService/GuestCtrl: Update.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (2 diffs)
• VBoxServiceControlExec.cpp (modified) (1 diff)
• VBoxServiceControlExecThread.cpp (modified) (7 diffs)
• VBoxServiceControlExecThread.h (modified) (1 diff)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServicePipeBuf.cpp (modified) (1 diff)

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

@@ -252 +252 @@
 }
 
+
 void VBoxServiceControlThreadSignalShutdown(const PVBOXSERVICECTRLTHREAD pThread)
 {
@@ -263 +264 @@
     AssertPtrReturn(pThread, VERR_INVALID_POINTER);
     int rc = VINF_SUCCESS;
-    if (pThread->Thread != NIL_RTTHREAD)
+    if (   pThread->Thread != NIL_RTTHREAD
+        && !pThread->fShutdown) /* Only shutdown threads which aren't yet. */
     {
         /* Wait a bit ... */

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

@@ -1411 +1411 @@
                 VBoxServiceError("ControlExec: [PID %u]: Failed to retrieve output, CID=%u, uHandle=%u, rc=%Rrc\n",
                                  uPID, uContextID, uHandleID, rc);
-
             /* Note: Since the context ID is unique the request *has* to be completed here,
              *       regardless whether we got data or not! Otherwise the progress object

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

@@ -380 +380 @@
             if (RT_SUCCESS(rc))
             {
-                uint32_t cbRead = cbSize;
+                uint32_t cbRead = cbSize; /* Read as much as possible. */
                 rc = VBoxServicePipeBufRead(pPipeBuf, pBuf, cbSize, &cbRead);
                 if (RT_SUCCESS(rc))
                 {
-#if 0
-                    if (!cbRead)
-                        AssertReleaseMsg(fEnabled == VBoxServicePipeBufIsEnabled(pPipeBuf),
+                    if (   !cbRead
+                        && fEnabled)
+                    {
+                        AssertReleaseMsg(!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;
@@ -409 +410 @@
 
 
+int VBoxServiceControlExecThreadRemove(uint32_t uPID)
+{
+    int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect);
+    if (RT_SUCCESS(rc))
+    {
+        PVBOXSERVICECTRLTHREAD pThread = vboxServiceControlExecThreadGetByPID(uPID);
+        if (pThread)
+        {
+            Assert(pThread->fStarted != pThread->fStopped);
+            if (pThread->fStopped) /* Only shut down stopped threads. */
+            {
+                VBoxServiceVerbose(4, "ControlExec: [PID %u]: Removing thread ... \n",
+                                   uPID);
+
+                rc = VBoxServiceControlExecThreadShutdown(pThread);
+
+                RTListNodeRemove(&pThread->Node);
+                RTMemFree(pThread);
+            }
+        }
+        else
+            rc = VERR_NOT_FOUND;
+
+        int rc2 = RTCritSectLeave(&g_GuestControlThreadsCritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    return rc;
+}
+
+/* Does not do locking, must be done by the caller! */
 int VBoxServiceControlExecThreadShutdown(const PVBOXSERVICECTRLTHREAD pThread)
 {
@@ -437 +470 @@
 int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed)
 {
+    AssertPtrReturn(pbAllowed, VERR_INVALID_POINTER);
+
     int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect);
     if (RT_SUCCESS(rc))
@@ -445 +480 @@
          */
         bool fLimitReached = false;
-        if (g_GuestControlProcsMaxKept) /* If we allow unlimited processes, take a shortcut. */
+        if (g_GuestControlProcsMaxKept) /* If we allow unlimited processes (=0), take a shortcut. */
         {
             /** @todo Put running/stopped (+ memory alloc) stats into global struct! */
@@ -471 +506 @@
             if (iProcsLeft < 0)
             {
-                VBoxServiceVerbose(3, "ControlExec: Maximum running guest processes reached\n");
+                VBoxServiceVerbose(3, "ControlExec: Maximum running guest processes reached (%u)\n",
+                                   g_GuestControlProcsMaxKept);
                 fLimitReached = true;
             }
@@ -490 +526 @@
                         if (RT_FAILURE(rc2))
                         {
-                            VBoxServiceError("ControlExec: Unable to shut down thread due to policy, rc=%Rrc", rc2);
+                            VBoxServiceError("ControlExec: Unable to shut down thread due to policy, rc=%Rrc\n", rc2);
                             if (RT_SUCCESS(rc))
                                 rc = rc2;
@@ -500 +536 @@
                         pNode = pNext;
 
+                        Assert(uProcsToKill);
                         uProcsToKill--;
                         if (!uProcsToKill)
                             break;
-
                     }
                 }

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

@@ -31 +31 @@
 int VBoxServiceControlExecThreadGetOutput(uint32_t uPID, uint32_t uHandleId, uint32_t uTimeout,
                                           uint8_t *pBuf, uint32_t cbSize, uint32_t *pcbRead);
+int VBoxServiceControlExecThreadRemove(uint32_t uPID);
 int VBoxServiceControlExecThreadSetInput(uint32_t uPID, bool fPendingClose, uint8_t *pBuf,
                                          uint32_t cbSize, uint32_t *pcbWritten);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -158 +158 @@
     RTPIPE      hNotificationPipeR;
     /** The event semaphore for getting notified whether something
-     *  has changed, e.g. written or read from this buffer. */
+     *  has changed, e.g. written to this buffer or enabled/disabled it. */
     RTSEMEVENT  hEventSem;
 } VBOXSERVICECTRLEXECPIPEBUF;

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

@@ -112 +112 @@
 
 #ifdef DEBUG_andy
-            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
+            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read cbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
                                pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset);
 #endif
-            if (pBuf->hEventSem != NIL_RTSEMEVENT)
-            {
-                rc = RTSemEventSignal(pBuf->hEventSem);
-                AssertRC(rc);
-            }
+            /* Don't signal event semaphore here -- we only read out something from
+             * this pipe buffer. */
 
             *pcbToRead = cbToRead;