Changeset 28233 in vbox for trunk/src/VBox

Timestamp:

Apr 13, 2010 8:23:52 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (2 diffs)
• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (6 diffs)
• HostServices/GuestControl/service.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (6 diffs)
• Main/include/GuestImpl.h (modified) (1 diff)

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

@@ -224 +224 @@
  ** @todo Docs!
  */
-VBGLR3DECL(int) VbglR3GuestCtrlExecReportStatus(uint32_t  u32ClientId, 
-                                                uint32_t  u32PID,
-                                                uint32_t  u32Status,
-                                                uint32_t  u32Flags,
-                                                void     *pvData,
-                                                uint32_t  cbData)
+VBGLR3DECL(int) VbglR3GuestCtrlExecReportStatus(uint32_t     u32ClientId, 
+                                                uint32_t     u32PID,
+                                                uint32_t     u32Status,
+                                                uint32_t     u32Flags,
+                                                void        *pvData,
+                                                uint32_t     cbData)
 {
     VBoxGuestCtrlHGCMMsgExecStatus Msg;
@@ -238 +238 @@
     Msg.hdr.cParms = 4;
 
-    VbglHGCMParmUInt32Set(&Msg.pid, 0);
-    VbglHGCMParmUInt32Set(&Msg.status, 0);
-    VbglHGCMParmUInt32Set(&Msg.flags, 0);
+    VbglHGCMParmUInt32Set(&Msg.pid, u32PID);
+    VbglHGCMParmUInt32Set(&Msg.status, u32Status);
+    VbglHGCMParmUInt32Set(&Msg.flags, u32Flags);
     VbglHGCMParmPtrSet(&Msg.data, pvData, cbData);
 

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

@@ -235 +235 @@
 
 
-static int VBoxServiceControlExecProcLoop(RTPROCESS hProcess, RTMSINTERVAL cMillies, RTPOLLSET hPollSet,
+static int VBoxServiceControlExecProcLoop(uint32_t uClientID, RTPROCESS hProcess, RTMSINTERVAL cMillies, RTPOLLSET hPollSet,
                                           RTPIPE hStdInW, RTPIPE hStdOutR, RTPIPE hStdErrR)
 {
@@ -260 +260 @@
      * and that it's now OK to send input to the process.
      */
-    rc = VINF_SUCCESS;
+    rc = VbglR3GuestCtrlExecReportStatus(uClientID, hProcess, 
+                                         PROC_STS_STARTED, 0 /* u32Flags */, 
+                                         NULL /* pvData */, 0 /* cbData */);
 
     /*
@@ -401 +403 @@
     if (RT_SUCCESS(rc))
     {
+        uint32_t uStatus = PROC_STS_UNDEFINED;
+        uint32_t uFlags = 0;
+
         if (     fProcessTimedOut  && !fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
-
+            uStatus = PROC_STS_TOK;
         }
         else if (fProcessTimedOut  &&  fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
-
+            uStatus = PROC_STS_TOA;
         }
         /*else if (g_fTerminate && (fProcessAlive || MsProcessKilled != UINT64_MAX))
         {
-
+            uStatus = PROC_STS_DWN;
         }*/
         else if (fProcessAlive)
         {
-
+            VBoxServiceError("Control: Process is alive when it should not!\n");
         }
         else if (MsProcessKilled != UINT64_MAX)
         {
-
-        }
-        else if (   ProcessStatus.enmReason == RTPROCEXITREASON_NORMAL
-                 && ProcessStatus.iStatus   == 0)
-        {
-
+            VBoxServiceError("Control: Process has been killed when it should not!\n");
         }
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_NORMAL)
         {
-
+            uStatus = PROC_STS_TEN;
+            uFlags = ProcessStatus.iStatus;
         }
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_SIGNAL)
         {
-
+            uStatus = PROC_STS_TES;
+            uFlags = ProcessStatus.iStatus;
         }
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_ABEND)
         {
-
+            uStatus = PROC_STS_TEA;
+            uFlags = ProcessStatus.iStatus;
         }
         else
         {
-
-        }
-    }
-
+            VBoxServiceError("Control: Process has reached an undefined status!\n");
+        }
+       
+        VBoxServiceVerbose(3, "Control: Process ended: Status=%u, Flags=%u\n", uStatus, uFlags);
+        rc = VbglR3GuestCtrlExecReportStatus(uClientID, hProcess, 
+                                             uStatus, uFlags,
+                                             NULL /* pvData */, 0 /* cbData */);
+    }
     RTMemFree(StdInBuf.pch);
     return rc;
@@ -665 +672 @@
                                 {
                                     VBoxServiceVerbose(3, "Control: Process \"%s\" started.\n", pData->pszCmd);
-                                    rc = VbglR3GuestCtrlExecReportStatus(u32ClientID, 123, PROC_STATUS_STARTED, 
-                                                                         0 /* u32Flags */, NULL, 0);
                                     /** @todo Dump a bit more info here. */
 
@@ -679 +684 @@
                                     phStdErr   = NULL;
 
-                                    rc = VBoxServiceControlExecProcLoop(hProcess, pData->uTimeLimitMS, hPollSet,
+                                    /* Enter the process loop. */
+                                    rc = VBoxServiceControlExecProcLoop(u32ClientID,
+                                                                        hProcess, pData->uTimeLimitMS, hPollSet,
                                                                         hStdInW, hStdOutR, hStdErrR);
+                                    VBoxServiceVerbose(3, "Control: Process loop ended with rc=%Rrc\n", rc);
+
                                     /*
                                      * The handles that are no longer in the set have
@@ -713 +722 @@
 
     /*
-     * Since we (hopefully) are the one ones that hold the thread data,
+     * Since we (hopefully) are the only ones that hold the thread data,
      * destroy them now.
      */

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -489 +489 @@
 int Service::notifyHost(VBOXHGCMCALLHANDLE callHandle, uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
-    LogFlowFunc (("eFunction=%ld, cParms=%ld, paParms=%p\n", 
-                  eFunction, cParms, paParms));
-    HOSTCALLBACKDATA HostCallbackData;
-    HostCallbackData.u32Magic = HOSTCALLBACKMAGIC;
-
-    int rc = mpfnHostCallback (mpvHostData, 0 /*u32Function*/,
-                           (void *)(&HostCallbackData),
-                           sizeof(HostCallbackData));
-    LogFlowFunc (("returning %Rrc\n", rc));
+    LogFlowFunc(("eFunction=%ld, cParms=%ld, paParms=%p\n", 
+                 eFunction, cParms, paParms));
+
+    int rc;
+    if (   eFunction == GUEST_EXEC_SEND_STATUS
+        && cParms    == 4)
+    {
+        HOSTEXECCALLBACKDATA data;
+        data.u32Magic = HOSTCALLBACKMAGIC;
+        paParms[0].getUInt32(&data.pid);
+        paParms[1].getUInt32(&data.status);
+        paParms[2].getUInt32(&data.flags);
+        paParms[4].getPointer(&data.pvData, &data.cbData);
+
+        rc = mpfnHostCallback (mpvHostData, 0 /*u32Function*/,
+                               (void *)(&data),
+                               sizeof(data));
+    }   
+    else
+        rc = VERR_NOT_SUPPORTED;
+    LogFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }

trunk/src/VBox/Main/GuestImpl.cpp

@@ -437 +437 @@
 }
 
-// static
-DECLCALLBACK(int) Guest::doGuestCtrlNotification(void *pvExtension,
-                                                 uint32_t u32Function,
-                                                 void *pvParms,
-                                                 uint32_t cbParms)
+/**
+ * Static callback function for receiving updates on processes started on
+ * the guest side.
+ *
+ * @returns VBox status code.
+ *
+ * @todo
+ *
+ */
+DECLCALLBACK(int) Guest::doGuestCtrlExecNotification(void *pvExtension,
+                                                     uint32_t u32Function,
+                                                     void *pvParms,
+                                                     uint32_t cbParms)
 {
     using namespace guestControl;
@@ -449 +457 @@
      * changes to the object state.
      */
-    PHOSTCALLBACKDATA pCBData = reinterpret_cast<PHOSTCALLBACKDATA>(pvParms);
+    PHOSTEXECCALLBACKDATA pCBData = reinterpret_cast<PHOSTEXECCALLBACKDATA>(pvParms);
     AssertPtr(pCBData);
-    AssertReturn(sizeof(HOSTCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER);
+    AssertReturn(sizeof(HOSTEXECCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER);
     AssertReturn(HOSTCALLBACKMAGIC == pCBData->u32Magic, VERR_INVALID_PARAMETER);
     LogFlowFunc(("pvExtension = %p, u32Function = %d, pvParms = %p, cbParms = %d\n",
                  pvExtension, u32Function, pvParms, cbParms));
+    ComObjPtr<Guest> pGuest = reinterpret_cast<Guest *>(pvExtension);
 
     int rc = VINF_SUCCESS;
-    Guest *pGuest = static_cast <Guest *>(pvExtension);
-    AssertPtr(pGuest);
-
-    switch (u32Function)
-    {        
-        case GUEST_EXEC_SEND_STATUS:
-            LogFlowFunc(("GUEST_EXEC_SEND_STATUS\n"));
-            break;
-
-        default:
-            rc = VERR_NOT_SUPPORTED;
-            break;
-    }
+    if (u32Function == GUEST_EXEC_SEND_STATUS)
+    {
+        
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
 
     ASMAtomicWriteBool(&pGuest->mSignalled, true);
@@ -520 +522 @@
         HGCMSVCEXTHANDLE hExt;
         int vrc = HGCMHostRegisterServiceExtension(&hExt, "VBoxGuestControlSvc",
-                                                   &Guest::doGuestCtrlNotification,
+                                                   &Guest::doGuestCtrlExecNotification,
                                                    this);
         if (RT_SUCCESS(vrc))
@@ -594 +596 @@
                         if (vmmDev)
                         {
-                            LogFlow(("Guest::ExecuteProgram: numParms=%d\n", i));
+                            LogFlowFunc(("hgcmHostCall numParms=%d\n", i));
                             vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_CMD,
                                                        i, paParms);
-                            /** @todo Get the PID. */
                         }
                         RTMemFree(pvEnv);
@@ -605 +606 @@
                 if (RT_SUCCESS(vrc))
                 {
-                    /* Wait for the HGCM low level callback */
+                    LogFlowFunc(("Waiting for HGCM callback (timeout=%ldms) ...\n", aTimeoutMS));
+
+                    /* 
+                     * Wait for the HGCM low level callback until the process
+                     * has been started (or something went wrong). This is necessary to 
+                     * get the PID.
+                     */
                     mSignalled = false;
                     uint64_t u64Started = RTTimeMilliTS();
@@ -622 +629 @@
                         RTThreadSleep(100);
                     } while (!mSignalled);
+
+                    /* Did we get some status? */
+                    if (mSignalled)
+                    {
+
+                    }
 #if 0
                     progress.queryInterfaceTo(aProgress);

trunk/src/VBox/Main/include/GuestImpl.h

@@ -110 +110 @@
     int prepareExecuteEnv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnv);
     /** Static callback for handling guest notifications. */
-    static DECLCALLBACK(int) doGuestCtrlNotification(void *pvExtension, uint32_t u32Function, void *pvParms, uint32_t cbParms);
+    static DECLCALLBACK(int) doGuestCtrlExecNotification(void *pvExtension, uint32_t u32Function, void *pvParms, uint32_t cbParms);
 # endif