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

Timestamp:

Apr 23, 2010 7:57:16 AM (15 years ago)

Author:

vboxsync

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

60476

Message:

Guest Control: Update (no buffered host waiting anymore, fixed a couple of deadlocks and shutdown crashes).

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (1 diff)

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

@@ -531 +531 @@
     int rc = VINF_SUCCESS;
 
-    HostCmd newCmd;
-    rc = paramBufferAllocate(&newCmd.parmBuf, eFunction, cParms, paParms);
-    if (RT_SUCCESS(rc))
-    {
-        mHostCmds.push_back(newCmd);
-
-        /* Limit list size by deleting oldest element. */
-        if (mHostCmds.size() > 256) /** @todo Use a define! */
-            mHostCmds.pop_front();
-    }
-
     /* Some lazy guests to wake up which can process this command right now? */
     if (!mGuestWaiters.empty())
     {
-        GuestCall curCall = mGuestWaiters.front();
-        rc = notifyGuest(&curCall, eFunction, cParms, paParms);
-        mGuestWaiters.pop_front();
-    }
+        HostCmd newCmd;
+        rc = paramBufferAllocate(&newCmd.parmBuf, eFunction, cParms, paParms);
+        if (RT_SUCCESS(rc))
+        {
+            mHostCmds.push_back(newCmd);
+    
+            /* Limit list size by deleting oldest element. */
+            if (mHostCmds.size() > 256) /** @todo Use a define! */
+                mHostCmds.pop_front();
+
+            GuestCall curCall = mGuestWaiters.front();
+            rc = notifyGuest(&curCall, eFunction, cParms, paParms);
+            mGuestWaiters.pop_front();
+        }
+    }
+    else /* No guest waiting, don't bother ... */
+        rc = VERR_TIMEOUT;
     return rc;
 }