Changeset 47695 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 13, 2013 2:40:20 PM (11 years ago)

Author:

vboxsync

Message:

Additions/GuestCtrl: Use a separate filter mask + value for message filtering.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (2 diffs)
• VBoxService/VBoxServiceControlProcess.cpp (modified) (1 diff)
• VBoxService/VBoxServiceControlSession.cpp (modified) (5 diffs)

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

@@ -138 +138 @@
  * @return  IPRT status code.
  * @param   uClientId       The client ID returned by VbglR3GuestCtrlConnect().
- * @param   uFilterAdd      Context ID filter mask to add.
- * @param   uFilterRemove   Context ID filter mask to remove.
- */
-VBGLR3DECL(int) VbglR3GuestCtrlMsgFilterSet(uint32_t uClientId,
-                                            uint32_t uFilterAdd, uint32_t uFilterRemove)
+ * @param   uValue          The value to filter messages for.
+ * @param   uMaskAdd        Filter mask to add.
+ * @param   uMaskRemove     Filter mask to remove.
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlMsgFilterSet(uint32_t uClientId, uint32_t uValue,
+                                            uint32_t uMaskAdd, uint32_t uMaskRemove)
 {
     HGCMMsgCmdFilterSet Msg;
@@ -149 +150 @@
     Msg.hdr.u32ClientID = uClientId;
     Msg.hdr.u32Function = GUEST_MSG_FILTER_SET; /* Tell the host we want to set a filter. */
-    Msg.hdr.cParms      = 3;
-
-    VbglHGCMParmUInt32Set(&Msg.add, uFilterAdd);
-    VbglHGCMParmUInt32Set(&Msg.remove, uFilterRemove);
+    Msg.hdr.cParms      = 4;
+
+    VbglHGCMParmUInt32Set(&Msg.value, uValue);
+    VbglHGCMParmUInt32Set(&Msg.mask_add, uMaskAdd);
+    VbglHGCMParmUInt32Set(&Msg.mask_remove, uMaskRemove);
     VbglHGCMParmUInt32Set(&Msg.flags, 0 /* Flags, unused */);
 

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

@@ -1442 +1442 @@
     /* The process thread is not interested in receiving any commands;
      * tell the host service. */
-    rc = VbglR3GuestCtrlMsgFilterSet(pProcess->uClientID, 0 /* Skip all */, 0);
+    rc = VbglR3GuestCtrlMsgFilterSet(pProcess->uClientID, 0 /* Skip all */,
+                                     0 /* Filter mask to add */, 0 /* Filter mask to remove */);
     if (RT_FAILURE(rc))
     {

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

@@ -911 +911 @@
 
 /**
- * Thread main routine for a forked guest session. This
- * thread runs in the main executable to control the forked
+ * Thread main routine for a forked guest session process.
+ * This thread runs in the main executable to control the forked
  * session process.
  *
@@ -936 +936 @@
         /* The session thread is not interested in receiving any commands;
          * tell the host service. */
-        rc = VbglR3GuestCtrlMsgFilterSet(uClientID, 0 /* Skip all */, 0);
+        rc = VbglR3GuestCtrlMsgFilterSet(uClientID, 0 /* Skip all */,
+                                         0 /* Filter mask to add */, 0 /* Filter mask to remove */);
         if (RT_FAILURE(rc))
         {
             VBoxServiceError("Unable to set message filter, rc=%Rrc\n", rc);
             /* Non-critical. */
+            rc = VINF_SUCCESS;
         }
     }
     else
-    {
         VBoxServiceError("Error connecting to guest control service, rc=%Rrc\n", rc);
-        return rc;
-    }
-
-    /* Let caller know that we're done initializing. */
-    rc = RTThreadUserSignal(RTThreadSelf());
+
+    if (RT_FAILURE(rc))
+        pThread->fShutdown = true;
+
+    /* Let caller know that we're done initializing, regardless of the result. */
+    int rc2 = RTThreadUserSignal(RTThreadSelf());
+    AssertRC(rc2);
+
     if (RT_FAILURE(rc))
         return rc;
@@ -1069 +1073 @@
     Assert(uSessionStatus != GUEST_SESSION_NOTIFYTYPE_UNDEFINED);
     VBGLR3GUESTCTRLCMDCTX ctx = { uClientID, VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(uSessionID) };
-    int rc2 = VbglR3GuestCtrlSessionNotify(&ctx,
-                                           uSessionStatus, uSessionRc);
+    rc2 = VbglR3GuestCtrlSessionNotify(&ctx,
+                                       uSessionStatus, uSessionRc);
     if (RT_FAILURE(rc2))
         VBoxServiceError("Reporting session ID=%RU32 final status failed with rc=%Rrc\n",
@@ -1100 +1104 @@
          * session we don't want to handle. */
         uint32_t uFilterAdd =
-            VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(pSession->StartupInfo.uSessionID);
-        uFilterAdd |= 0x7FFFFFF; /* We only want to filter for session IDs. */
-
-        rc = VbglR3GuestCtrlMsgFilterSet(uClientID, uFilterAdd, 0 /* Filter remove */);
+            VBOX_GUESTCTRL_FILTER_BY_SESSION(pSession->StartupInfo.uSessionID);
+        rc = VbglR3GuestCtrlMsgFilterSet(uClientID,
+                                         VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(pSession->StartupInfo.uSessionID),
+                                         uFilterAdd, 0 /* Filter remove */);
         VBoxServiceVerbose(3, "Setting message filterAdd=0x%x returned %Rrc\n",
                            uFilterAdd, rc);
@@ -1930 +1934 @@
     int rc = GstCntlSessionThreadWait(pThread,
                                       5 * 60 * 1000 /* 5 minutes timeout */, uFlags);
-    /** @todo Kill session process if still around? */
 
     /* Remove session from list and destroy object. */
     RTListNodeRemove(&pThread->Node);
+
     RTMemFree(pThread);
+    pThread = NULL;
 
     return rc;