Changeset 75750 in vbox

Timestamp:

Nov 26, 2018 7:01:13 PM (6 years ago)

Author:

vboxsync

Message:

GuestControl: Restore peek count if the guest cancels the GUEST_MSG_WAIT request (liek for a SIGCHLD).

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (7 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -629 +629 @@
     }
 
+    /** Used by Wakeup() and RunCurrent(). */
     int Run(ClientConnection const *pConnection,
             HostCommand            *pHostCmd)
@@ -661 +662 @@
              *        host command via an own GUEST_ type message.
              */
-            if (rc == VERR_TOO_MUCH_DATA)
+            if (   rc == VERR_TOO_MUCH_DATA
+                || rc == VERR_CANCELLED)
             {
                 if (mHostCmdTries == 6)
@@ -722 +724 @@
     }
 
+    /** Used by for Service::hostProcessCommand(). */
     int Wakeup(void)
     {
@@ -779 +782 @@
     }
 
+    /** Internal worker for Run(). */
     int SendReply(ClientConnection const *pConnection,
                   HostCommand            *pHostCmd)
@@ -784 +788 @@
         AssertPtrReturn(pConnection, VERR_INVALID_POINTER);
         AssertPtrReturn(pHostCmd, VERR_INVALID_POINTER);
+
+        /* In case of VERR_CANCELLED. */
+        uint32_t const cSavedPeeks = mPeekCount;
 
         int rc;
@@ -824 +831 @@
          * the pending call with the result we just got. */
         AssertPtr(mSvcHelpers);
-        mSvcHelpers->pfnCallComplete(pConnection->mHandle, rc);
+        int rc2 = mSvcHelpers->pfnCallComplete(pConnection->mHandle, rc);
+
+        /* Rollback in case the guest cancelled the call. */
+        if (rc2 == VERR_CANCELLED && RT_SUCCESS(rc))
+        {
+            mPeekCount = cSavedPeeks;
+            rc = VERR_CANCELLED;
+        }
 
         LogFlowThisFunc(("[Client %RU32] Command %RU32 ended with %Rrc (mPeekCount=%RU32, pConnection=%p)\n",
@@ -1392 +1406 @@
                 uClientsWokenUp++;
 #endif
+                /** @todo r=bird: Do we need to queue commands on more than one client? */
             }