Changeset 29438 in vbox for trunk/src/VBox/HostServices/GuestControl

Timestamp:

May 12, 2010 9:50:16 PM (15 years ago)

Author:

vboxsync

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

61556

Message:

Guest Control/VBoxService: Added support for cancel pending (blocking) calls; added support for properly stopping + shutting down main thread.

File:

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

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

@@ -220 +220 @@
     int sendHostCmdToGuest(HostCmd *pCmd, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int retrieveNextHostCmd(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+    int cancelPendingWaits(uint32_t u32ClientID);
     int notifyHost(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int processHostCmd(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
@@ -443 +444 @@
 }
 
+int Service::cancelPendingWaits(uint32_t u32ClientID)
+{
+    int rc = VINF_SUCCESS;
+    CallListIter it = mClientList.begin();
+    while (it != mClientList.end())
+    {
+        if (it->mClientID == u32ClientID)
+        {       
+            if (it->mNumParms >= 2)
+            {
+                it->mParms[0].setUInt32(GETHOSTMSG_EXEC_HOST_CANCEL_WAIT); /* Message ID */
+                it->mParms[1].setUInt32(0);                                /* Required parameters for message */
+            }              
+            if (mpHelpers)
+                mpHelpers->pfnCallComplete(it->mHandle, rc);      
+            it = mClientList.erase(it);
+        }
+        else
+            it++;
+    }
+    return rc;
+}
+
 int Service::notifyHost(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
@@ -503 +527 @@
 
             /* In any case the client did something, so wake up and remove from list. */
+            AssertPtr(mpHelpers);
             mpHelpers->pfnCallComplete(guest.mHandle, rc);
             mClientList.pop_front();                       
@@ -559 +584 @@
                 break;
 
+            case GUEST_CANCEL_PENDING_WAITS:
+                LogFlowFunc(("GUEST_CANCEL_PENDING_WAITS\n"));
+                rc = cancelPendingWaits(u32ClientID);
+                break;
+
             /* The guest notifies the host that some output at stdout/stderr is available. */
             case GUEST_EXEC_SEND_OUTPUT:
@@ -578 +608 @@
         {
             /* Tell the client that the call is complete (unblocks waiting). */
+            AssertPtr(mpHelpers);
             mpHelpers->pfnCallComplete(callHandle, rc);
         }