Changeset 40568 in vbox for trunk

Timestamp:

Mar 21, 2012 4:11:19 PM (13 years ago)

Author:

vboxsync

Message:

Main/Metrics: Fix for multiple metrics configuration in one call (#6029)

File:

• trunk/src/VBox/Main/src-server/Performance.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/Performance.cpp

@@ -490 +490 @@
      * guest metrics collection, so we rely on this fact to detect blocked
      * guests. If the guest has not finished processing the previous request
-     * we consider it blocked.
+     * after half a second we consider it blocked.
      */
     if (aRequest->getGuest() && aRequest->getGuest() == mGuestBeingCalled)
     {
-        /* Request execution got stalled for this guest -- report an error */
-        return E_FAIL;
+        /* 
+         * Before we can declare a guest blocked we need to wait for a while
+         * and then check again as it may never had a chance to process
+         * the previous request. Half a second is an eternity for processes
+         * and is barely noticable by humans.
+         */
+        LogAleksey(("{%p} " LOG_FN_FMT ": Suspecting %s is stalled. Waiting for .5 sec...\n",
+                    this, __PRETTY_FUNCTION__,
+                    aRequest->getGuest()->getVMName().c_str()));
+        RTThreadSleep(500 /* ms */);
+        if (aRequest->getGuest() == mGuestBeingCalled) {
+            LogAleksey(("{%p} " LOG_FN_FMT ": Request processing stalled for %s\n",
+                        this, __PRETTY_FUNCTION__,
+                        aRequest->getGuest()->getVMName().c_str()));
+            /* Request execution got stalled for this guest -- report an error */
+            return E_FAIL;
+        }
     }
     mQueue.push(aRequest);
@@ -509 +524 @@
     HRESULT rc = S_OK;
 
-    LogAleksey(("{%p} " LOG_FN_FMT ": Starting request processing loop...p\n",
+    LogAleksey(("{%p} " LOG_FN_FMT ": Starting request processing loop...\n",
                 mgr, __PRETTY_FUNCTION__));
     while ((pReq = mgr->mQueue.pop()) != NULL)