Changeset 75722 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Nov 25, 2018 6:41:27 PM (6 years ago)

Author:

vboxsync

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

126921

Message:

VBoxServiceControl: Don't count VERR_INTERRUPTED into the VbglR3GuestCtrlMsgWaitFor failures, nor should we sleep for a 1 second on these. No else{} after continue/break.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (5 diffs)

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

@@ -248 +248 @@
     for (;;)
     {
-        VGSvcVerbose(3, "Waiting for host msg ...\n");
+        VGSvcVerbose(3, "GstCtrl: Waiting for host msg ...\n");
         uint32_t uMsg = 0;
         uint32_t cParms = 0;
@@ -255 +255 @@
         {
 #ifdef DEBUG
-            VGSvcVerbose(4, "Message requires %ld parameters, but only 2 supplied -- retrying request (no error!)...\n",
+            VGSvcVerbose(4, "Message requires %u parameters, but only 2 supplied -- retrying request (no error!)...\n",
                          cParms);
 #endif
@@ -263 +263 @@
         {
             /* Note: VERR_GEN_IO_FAILURE seems to be normal if ran into timeout. */
-            VGSvcError("Getting host message failed with %Rrc\n", rc);
+            VGSvcError("GstCtrl: Getting host message failed with %Rrc\n", rc);
 
             /* Check for VM session change. */
@@ -271 +271 @@
                 && (idNewSession != g_idControlSession))
             {
-                VGSvcVerbose(1, "The VM session ID changed\n");
+                VGSvcVerbose(1, "GstCtrl: The VM session ID changed\n");
                 g_idControlSession = idNewSession;
 
@@ -288 +288 @@
                     continue; /* Skip waiting. */
                 }
-                else
-                {
-                    VGSvcError("Unable to re-connect to HGCM service, rc=%Rrc, bailing out\n", rc);
-                    break;
-                }
+                VGSvcError("Unable to re-connect to HGCM service, rc=%Rrc, bailing out\n", rc);
+                break;
             }
 
-            if (++cRetrievalFailed > 16) /** @todo Make this configurable? */
+            if (rc == VERR_INTERRUPTED)
+                RTThreadYield();        /* To be on the safe side... */
+            else if (++cRetrievalFailed <= 16) /** @todo Make this configurable? */
+                RTThreadSleep(1000);    /* Wait a bit before retrying. */
+            else
             {
                 VGSvcError("Too many failed attempts in a row to get next message, bailing out\n");
                 break;
             }
-
-            RTThreadSleep(1000); /* Wait a bit before retrying. */
         }