Changeset 28286 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Apr 14, 2010 10:02:30 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (introducing contexts for callbacks).

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (3 diffs)
• VBoxServiceControlExec.cpp (modified) (11 diffs)
• VBoxServiceInternal.h (modified) (2 diffs)

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

@@ -96 +96 @@
 static int VBoxServiceControlHandleCmdExec(uint32_t u32ClientId, uint32_t uNumParms)
 {
+    uint32_t uContextID;
     char szCmd[_1K];
     uint32_t uFlags;
@@ -110 +111 @@
     uint32_t uTimeLimitMS;
 
-    int rc = VbglR3GuestCtrlExecGetHostCmd(u32ClientId, uNumParms,
+    if (uNumParms != 14)
+        return VERR_INVALID_PARAMETER;
+
+    int rc = VbglR3GuestCtrlExecGetHostCmd(u32ClientId,
+                                           uNumParms,
+                                           &uContextID,
                                            /* Command */
                                            szCmd,      sizeof(szCmd),
@@ -134 +140 @@
     else
     {     
-        rc = VBoxServiceControlExecProcess(szCmd, uFlags, szArgs, uNumArgs,                                           
+        rc = VBoxServiceControlExecProcess(uContextID, szCmd, uFlags, szArgs, uNumArgs,                                           
                                            szEnv, cbEnv, uNumEnvVars,
                                            szStdIn, szStdOut, szStdErr,

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

@@ -235 +235 @@
 
 
-static int VBoxServiceControlExecProcLoop(uint32_t uClientID, RTPROCESS hProcess, RTMSINTERVAL cMillies, RTPOLLSET hPollSet,
+static int VBoxServiceControlExecProcLoop(PVBOXSERVICECTRLTHREADDATA pData,
+                                          RTPROCESS hProcess, RTMSINTERVAL cMillies, RTPOLLSET hPollSet,
                                           RTPIPE hStdInW, RTPIPE hStdOutR, RTPIPE hStdErrR)
 {
@@ -256 +257 @@
     RTMSINTERVAL        cMsPollCur                  = 0;
 
+    /* Assign PID to thread data. */
+    pData->uPID = hProcess;
+
     /*
      * Before entering the loop, tell the host that we've started the guest
      * and that it's now OK to send input to the process.
      */
-    rc = VbglR3GuestCtrlExecReportStatus(uClientID, hProcess, 
-                                         PROC_STS_STARTED, 0 /* u32Flags */, 
+    AssertPtr(pData);
+    rc = VbglR3GuestCtrlExecReportStatus(pData->uClientID, pData->uContextID,
+                                         pData->uPID, PROC_STS_STARTED, 0 /* u32Flags */, 
                                          NULL /* pvData */, 0 /* cbData */);
 
@@ -446 +451 @@
         }
        
-        VBoxServiceVerbose(3, "Control: Process ended: Status=%u, Flags=%u\n", uStatus, uFlags);
-        rc = VbglR3GuestCtrlExecReportStatus(uClientID, hProcess, 
-                                             uStatus, uFlags,
+        VBoxServiceVerbose(3, "Control: Process ended: PID=%u, Status=%u, Flags=%u\n", 
+                           pData->uPID, uStatus, uFlags);
+        rc = VbglR3GuestCtrlExecReportStatus(pData->uClientID, pData->uContextID,
+                                             pData->uPID, uStatus, uFlags,
                                              NULL /* pvData */, 0 /* cbData */);
     }
@@ -509 +515 @@
 
 /** Allocates and gives back a thread data struct which then can be used by the worker thread. */
-PVBOXSERVICECTRLTHREADDATA VBoxServiceControlExecAllocateThreadData(const char *pszCmd, uint32_t uFlags, 
+PVBOXSERVICECTRLTHREADDATA VBoxServiceControlExecAllocateThreadData(uint32_t u32ContextID, 
+                                                                    const char *pszCmd, uint32_t uFlags, 
                                                                     const char *pszArgs, uint32_t uNumArgs,                                           
                                                                     const char *pszEnv, uint32_t cbEnv, uint32_t uNumEnvVars,
@@ -519 +526 @@
         return NULL;
 
+    /* ClientID will be assigned when thread is started! */
+    pData->uContextID = u32ContextID;
     pData->pszCmd = RTStrDup(pszCmd);
     pData->uFlags = uFlags;
@@ -601 +610 @@
      */
     RTThreadUserSignal(RTThreadSelf());
-    VBoxServiceVerbose(3, "Control: Thread of process \"%s\" started.\n", pData->pszCmd);
-
-    uint32_t u32ClientID;
-    int rc = VbglR3GuestCtrlConnect(&u32ClientID);
+    VBoxServiceVerbose(3, "Control: Thread of process \"%s\" started\n", pData->pszCmd);
+
+    int rc = VbglR3GuestCtrlConnect(&pData->uClientID);
     if (RT_FAILURE(rc))
     {
@@ -685 +693 @@
 
                                     /* Enter the process loop. */
-                                    rc = VBoxServiceControlExecProcLoop(u32ClientID,
+                                    rc = VBoxServiceControlExecProcLoop(pData,
                                                                         hProcess, pData->uTimeLimitMS, hPollSet,
                                                                         hStdInW, hStdOutR, hStdErrR);
@@ -704 +712 @@
                                 else /* Something went wrong; report error! */
                                 {
-                                    int rc2 = VbglR3GuestCtrlExecReportStatus(u32ClientID, 0 /* PID */, 
+                                    int rc2 = VbglR3GuestCtrlExecReportStatus(pData->uClientID, pData->uContextID, pData->uPID, 
                                                                               PROC_STS_ERROR, rc,
                                                                               NULL /* pvData */, 0 /* cbData */);
@@ -726 +734 @@
     }
 
-    VbglR3GuestCtrlDisconnect(u32ClientID);
+    VbglR3GuestCtrlDisconnect(pData->uClientID);
     VBoxServiceVerbose(3, "Control: Thread of process \"%s\" ended with rc=%Rrc\n", pData->pszCmd, rc);
 
@@ -743 +751 @@
 }
 
-int VBoxServiceControlExecProcess(const char *pszCmd, uint32_t uFlags, 
+int VBoxServiceControlExecProcess(uint32_t uContextID, const char *pszCmd, uint32_t uFlags, 
                                   const char *pszArgs, uint32_t uNumArgs,                                           
                                   const char *pszEnv, uint32_t cbEnv, uint32_t uNumEnvVars,
@@ -750 +758 @@
 {
     PVBOXSERVICECTRLTHREADDATA pThreadData = 
-        VBoxServiceControlExecAllocateThreadData(pszCmd, uFlags, 
+        VBoxServiceControlExecAllocateThreadData(uContextID, 
+                                                 pszCmd, uFlags, 
                                                  pszArgs, uNumArgs,
                                                  pszEnv, cbEnv, uNumEnvVars, 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -129 +129 @@
 typedef struct
 {
+    uint32_t  uClientID;
+    uint32_t  uContextID;
+    uint32_t  uPID;
     char     *pszCmd;
     uint32_t  uFlags;
@@ -213 +216 @@
 
 #ifdef VBOX_WITH_GUEST_CONTROL
-extern int VBoxServiceControlExecProcess(const char *pszCmd, uint32_t uFlags, 
+extern int VBoxServiceControlExecProcess(uint32_t uContext, const char *pszCmd, uint32_t uFlags, 
                                          const char *pszArgs, uint32_t uNumArgs,                                           
                                          const char *pszEnv, uint32_t cbEnv, uint32_t uNumEnvVars,