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

Timestamp:

Apr 29, 2010 11:19:17 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Faster (no polling on guest side), free data on shutdown.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (2 diffs)
• VBoxService/VBoxService.cpp (modified) (2 diffs)
• VBoxService/VBoxServiceControl.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp

@@ -110 +110 @@
     VBoxGuestCtrlHGCMMsgType Msg;
 
-    Msg.hdr.u32Timeout = u32Timeout;
-    Msg.hdr.fInterruptible = true;
-
-    Msg.hdr.info.result = VERR_WRONG_ORDER;
-    Msg.hdr.info.u32ClientID = u32ClientId;
-    Msg.hdr.info.u32Function = GUEST_GET_HOST_MSG; /* Tell the host we want our next command. */
-    Msg.hdr.info.cParms = 2;                       /* Just peek for the next message! */
+    Msg.hdr.result = VERR_WRONG_ORDER;
+    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32Function = GUEST_GET_HOST_MSG; /* Tell the host we want our next command. */
+    Msg.hdr.cParms = 2;                       /* Just peek for the next message! */
 
     VbglHGCMParmUInt32Set(&Msg.msg, 0);
     VbglHGCMParmUInt32Set(&Msg.num_parms, 0);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {
@@ -128 +125 @@
             rc = VbglHGCMParmUInt32Get(&Msg.num_parms, puNumParms);
             if (RT_SUCCESS(rc))
-                rc = Msg.hdr.info.result;
+                rc = Msg.hdr.result;
                 /* Ok, so now we know what message type and how much parameters there are. */
     }

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

@@ -298 +298 @@
 {
     int rc;
-
     /*
      * Initialize the services.
@@ -314 +313 @@
             }
         }
-
     /*
      * Start the service(s).

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

@@ -239 +239 @@
         VBoxServiceVerbose(4, "Control: Waiting for host msg ...\n");
         rc = VbglR3GuestCtrlGetHostMsg(g_GuestControlSvcClientID, &uMsg, &uNumParms, 1000 /* 1s timeout */);
-        if (rc == VERR_TOO_MUCH_DATA)
-        {
-            VBoxServiceVerbose(3, "Control: Message requires %ld parameters, but only 2 supplied -- retrying request ...\n", uNumParms);
-            rc = VINF_SUCCESS;
-        }
-        else if (rc == VERR_TIMEOUT)
-        {
-            VBoxServiceVerbose(3, "Control: Wait timed out, waiting for next round ...\n");
-            RTThreadSleep(100);
-        }
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_TOO_MUCH_DATA)
+            {
+                VBoxServiceVerbose(3, "Control: Message requires %ld parameters, but only 2 supplied -- retrying request ...\n", uNumParms);
+                rc = VINF_SUCCESS; /* Try to get "real" message in next block below. */
+            }
+            else
+                VBoxServiceVerbose(3, "Control: Getting host message failed with %Rrc\n", rc); /* VERR_GEN_IO_FAILURE seems to be normal if ran  into timeout. */
+        }
+
         if (RT_SUCCESS(rc))
         {
@@ -272 +273 @@
         }
 
-        /*
-         * Block for a while.
-         *
-         * The event semaphore takes care of ignoring interruptions and it
-         * allows us to implement service wakeup later.
-         */
+        /* Do we need to shutdown? */
         if (*pfShutdown)
         {
@@ -283 +279 @@
             break;
         }
-        int rc2 = RTSemEventMultiWait(g_hControlEvent, g_ControlInterval);
-        if (*pfShutdown)
-        {
-            rc = 0;
-            break;
-        }
-        if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
-        {
-            VBoxServiceError("Control: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
-            rc = rc2;
-            break;
-        }
+
+        /* Let's sleep for a bit and let others run ... */
+        RTThreadYield();
     }