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

Timestamp:

Nov 28, 2018 11:47:11 PM (6 years ago)

Author:

vboxsync

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

127001

Message:

VBoxGuestControl: Optimizing message handling - part 1. bugref:9313

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (3 diffs)
• VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -366 +366 @@
 
 
-/**
- * Disables a previously set message filter.
- *
- * @return  IPRT status code.
- * @param   uClientId       The client ID returned by VbglR3GuestCtrlConnect().
- */
-VBGLR3DECL(int) VbglR3GuestCtrlMsgFilterUnset(uint32_t uClientId)
-{
-    /* Tell the host we want to unset the filter. */
-    HGCMMsgCmdFilterUnset Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, uClientId, GUEST_MSG_FILTER_UNSET, 1);
-    VbglHGCMParmUInt32Set(&Msg.flags, 0 /* Flags, unused */);
-
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
-}
-
-
 VBGLR3DECL(int) VbglR3GuestCtrlMsgReply(PVBGLR3GUESTCTRLCMDCTX pCtx,
                                         int rc)
@@ -416 +399 @@
  * @param   uClientId       The client ID returned by VbglR3GuestCtrlConnect().
  */
-VBGLR3DECL(int) VbglR3GuestCtrlMsgSkip(uint32_t uClientId)
+VBGLR3DECL(int) VbglR3GuestCtrlMsgSkipOld(uint32_t uClientId)
 {
     HGCMMsgCmdSkip Msg;
 
     /* Tell the host we want to skip the current assigned command. */
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, uClientId, GUEST_MSG_SKIP, 1);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, uClientId, GUEST_MSG_SKIP_OLD, 1);
     VbglHGCMParmUInt32Set(&Msg.flags, 0 /* Flags, unused */);
     return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -436 +419 @@
 {
     HGCMMsgCancelPendingWaits Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, uClientId, GUEST_CANCEL_PENDING_WAITS, 0);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, uClientId, GUEST_MSG_CANCEL, 0);
     return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
 }

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

@@ -361 +361 @@
                          * skip all not wanted messages here.
                          */
-                        rc = VbglR3GuestCtrlMsgSkip(g_uControlSvcClientID);
+                        rc = VbglR3GuestCtrlMsgSkipOld(g_uControlSvcClientID);
                         VGSvcVerbose(3, "Skipping uMsg=%RU32, cParms=%RU32, rc=%Rrc\n", uMsg, cParms, rc);
                     }

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

@@ -1067 +1067 @@
         VGSvcVerbose(3, "Unsupported message (uMsg=%RU32, cParms=%RU32) from host, skipping\n", uMsg, pHostCtx->uNumParms);
 
-        /** @todo r=bird: Why on earth couldn't you make GUEST_MSG_SKIP do this hacky stuff?!?
-         * You don't even know if you're replying to a message ment for you (see masking race further down).  */
-
         /*
          * !!! HACK ALERT BEGIN !!!
@@ -1103 +1100 @@
 
         /* Tell the host service to skip the message. */
-        VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID);
+        VbglR3GuestCtrlMsgSkipOld(pHostCtx->uClientID);
 
         rc = VINF_SUCCESS;