Changeset 47622 in vbox for trunk

Timestamp:

Aug 8, 2013 9:10:54 PM (11 years ago)

Author:

vboxsync

Message:

VBoxService/GuestCtrl: More message filtering for guest session + process threads; message processing not needed there, logging.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (1 diff)
• VBoxServiceControlProcess.cpp (modified) (3 diffs)
• VBoxServiceControlSession.cpp (modified) (8 diffs)

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

@@ -345 +345 @@
                                                GUEST_SESSION_NOTIFYTYPE_ERROR, rc /* uint32_t vs. int */);
         if (RT_FAILURE(rc2))
-        {
             VBoxServiceError("Reporting session error status on open failed with rc=%Rrc\n", rc2);
-            rc = rc2;
-        }
     }
 

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

@@ -1437 +1437 @@
     }
 
+    VBoxServiceVerbose(3, "Guest process \"%s\" got client ID=%u, flags=0x%x\n",
+                       pProcess->StartupInfo.szCmd, pProcess->uClientID, pProcess->StartupInfo.uFlags);
+
+    /* The process thread is not interested in receiving any commands;
+     * tell the host service. */
+    rc = VbglR3GuestCtrlMsgFilterSet(pProcess->uClientID, 0 /* Skip all */, 0);
+    if (RT_FAILURE(rc))
+    {
+        VBoxServiceError("Unable to set message filter, rc=%Rrc\n", rc);
+        /* Non-critical. */
+    }
+
     rc = GstCntlSessionProcessAdd(pProcess->pSession, pProcess);
     if (RT_FAILURE(rc))
@@ -1445 +1457 @@
         return rc;
     }
-
-    VBoxServiceVerbose(3, "Guest process \"%s\" got client ID=%u, flags=0x%x\n",
-                       pProcess->StartupInfo.szCmd, pProcess->uClientID, pProcess->StartupInfo.uFlags);
 
     bool fSignalled = false; /* Indicator whether we signalled the thread user event already. */
@@ -1936 +1945 @@
                )
             {
-                VBoxServiceVerbose(3, "[PID %RU32]: dump stdout\n",
-                                   pThis->uPID);
                 char szDumpFile[RTPATH_MAX];
                 if (!RTStrPrintf(szDumpFile, sizeof(szDumpFile), "VBoxService_Session%RU32_PID%RU32_StdOut.txt",

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

@@ -63 +63 @@
 static int                  gstcntlSessionHandleFileSeek(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
 static int                  gstcntlSessionHandleFileTell(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-extern int                  gstcntlSessionHandleProcExec(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-extern int                  gstcntlSessionHandleProcInput(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx, void *pvScratchBuf, size_t cbScratchBuf);
-extern int                  gstcntlSessionHandleProcOutput(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-extern int                  gstcntlSessionHandleProcTerminate(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-extern int                  gstcntlSessionHandleProcWaitFor(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-/* Guest -> Host handlers. */
+static int                  gstcntlSessionHandleProcExec(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
+static int                  gstcntlSessionHandleProcInput(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx, void *pvScratchBuf, size_t cbScratchBuf);
+static int                  gstcntlSessionHandleProcOutput(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
+static int                  gstcntlSessionHandleProcTerminate(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
+static int                  gstcntlSessionHandleProcWaitFor(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
 
 
@@ -513 +512 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    int rc;
+    int rc = VINF_SUCCESS;
     bool fStartAllowed = false; /* Flag indicating whether starting a process is allowed or not. */
 
-    if (   (pHostCtx->uProtocol <  2 && pHostCtx->uNumParms == 11)
-        || (pHostCtx->uProtocol >= 2 && pHostCtx->uNumParms == 12)
-       )
+    switch (pHostCtx->uProtocol)
+    {
+        case 1: /* Guest Additions < 4.3. */
+            if (pHostCtx->uNumParms != 11)
+                rc = VERR_NOT_SUPPORTED;
+            break;
+
+        case 2: /* Guest Additions >= 4.3. */
+            if (pHostCtx->uNumParms != 12)
+                rc = VERR_NOT_SUPPORTED;
+            break;
+
+        default:
+            rc = VERR_NOT_SUPPORTED;
+            break;
+    }
+
+    if (RT_SUCCESS(rc))
     {
         VBOXSERVICECTRLPROCSTARTUPINFO startupInfo;
@@ -568 +582 @@
         }
     }
-    else
-        rc = VERR_NOT_SUPPORTED; /* Unsupported number of parameters. */
 
     /* In case of an error we need to notify the host to not wait forever for our response. */
@@ -648 +660 @@
             fPendingClose = true;
 #ifdef DEBUG_andy
-            VBoxServiceVerbose(4, "Got last process input block for PID=%RU32 of size %RU32 ...\n",
+            VBoxServiceVerbose(4, "Got last process input block for PID=%RU32 (%RU32 bytes) ...\n",
                                uPID, cbSize);
 #endif
@@ -795 +807 @@
 
     int rc = VINF_SUCCESS;
-
-    /** @todo Implement asynchronous handling of all commands to speed up overall
-     *        performance for handling multiple guest processes at once. At the moment
-     *        only one guest process at a time can and will be served. */
-
     /**
      * Only anonymous sessions (that is, sessions which run with local
@@ -926 +933 @@
         VBoxServiceVerbose(3, "Session ID=%RU32 thread running, client ID=%RU32\n",
                            uSessionID, uClientID);
+
+        /* The session thread is not interested in receiving any commands;
+         * tell the host service. */
+        rc = VbglR3GuestCtrlMsgFilterSet(uClientID, 0 /* Skip all */, 0);
+        if (RT_FAILURE(rc))
+        {
+            VBoxServiceError("Unable to set message filter, rc=%Rrc\n", rc);
+            /* Non-critical. */
+        }
     }
     else
@@ -1140 +1156 @@
             if (rc == VERR_TOO_MUCH_DATA)
             {
+#ifdef DEBUG
                 VBoxServiceVerbose(4, "Message requires %RU32 parameters, but only 2 supplied -- retrying request (no error!)...\n", cParms);
+#endif
                 rc = VINF_SUCCESS; /* Try to get "real" message in next block below. */
             }
@@ -1147 +1165 @@
             if (RT_SUCCESS(rc))
             {
+#ifdef DEBUG
                 VBoxServiceVerbose(3, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
-
+#endif
                 /* Set number of parameters for current host context. */
                 ctxHost.uNumParms = cParms;