Changeset 39991 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2012 4:45:00 PM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Fixed unknown PIDs after retrieving output.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)
• Main/include/GuestImpl.h (modified) (1 diff)
• Main/src-client/GuestCtrlImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -875 +875 @@
                 ULONG uRetExitCode, uRetFlags;
                 rc = pGuest->GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &retStatus);
-                if (SUCCEEDED(rc) && fVerbose)
-                    RTPrintf("Exit code=%u (Status=%u [%s], Flags=%u)\n", uRetExitCode, retStatus, ctrlExecProcessStatusToText(retStatus), uRetFlags);
-                rcProc = ctrlExecProcessStatusToExitCode(retStatus, uRetExitCode);
+                if (SUCCEEDED(rc))
+                {
+                    if (fVerbose)
+                        RTPrintf("Exit code=%u (Status=%u [%s], Flags=%u)\n", uRetExitCode, retStatus, ctrlExecProcessStatusToText(retStatus), uRetFlags);
+                    rcProc = ctrlExecProcessStatusToExitCode(retStatus, uRetExitCode);
+                }
+                else
+                {
+                    ctrlPrintError(pGuest, COM_IIDOF(IGuest));
+                    rcProc = RTEXITCODE_FAILURE;
+                }
             }
         }

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

@@ -248 +248 @@
     typedef std::map< uint32_t, VBOXGUESTCTRL_PROCESS >::const_iterator GuestProcessMapIterConst;
 
-    int  processGetStatus(uint32_t u32PID, PVBOXGUESTCTRL_PROCESS pProcess);
+    int  processGetStatus(uint32_t u32PID, PVBOXGUESTCTRL_PROCESS pProcess, bool fRemove);
     int  processSetStatus(uint32_t u32PID, ExecuteProcessStatus_T enmStatus, uint32_t uExitCode, uint32_t uFlags);
 

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -994 +994 @@
  *
  * @return  IPRT status code.
- * @param   u32PID
- * @param   pProcess
+ * @param   u32PID                  PID of process to get status for.
+ * @param   pProcess                Where to store the process information.
+ * @param   fRemove                 Flag indicating whether to remove the
+ *                                  process from the map when process marked a
+ *                                  exited/terminated.
  */
-int Guest::processGetStatus(uint32_t u32PID, PVBOXGUESTCTRL_PROCESS pProcess)
+int Guest::processGetStatus(uint32_t u32PID, PVBOXGUESTCTRL_PROCESS pProcess,
+                            bool fRemove)
 {
     AssertReturn(u32PID, VERR_INVALID_PARAMETER);
@@ -1015 +1019 @@
         /* If the is marked as stopped/terminated
          * remove it from the map. */
-        if (it->second.mStatus != ExecuteProcessStatus_Started)
+        if (   fRemove
+            && it->second.mStatus != ExecuteProcessStatus_Started)
+        {
             mGuestProcessMap.erase(it);
+        }
 
         return VINF_SUCCESS;
@@ -1861 +1868 @@
     {
         VBOXGUESTCTRL_PROCESS process;
-        int vrc = processGetStatus(aPID, &process);
+        int vrc = processGetStatus(aPID, &process, false /* Don't remove */);
         if (RT_SUCCESS(vrc))
         {
@@ -2065 +2072 @@
     {
         VBOXGUESTCTRL_PROCESS proc;
-        int vrc = processGetStatus(aPID, &proc);
+        int vrc = processGetStatus(aPID, &proc, false /* Don't remove */);
         if (RT_FAILURE(vrc))
         {
@@ -2234 +2241 @@
     {
         VBOXGUESTCTRL_PROCESS process;
-        int vrc = processGetStatus(aPID, &process);
+        int vrc = processGetStatus(aPID, &process,
+                                   true /* Remove when terminated */);
         if (RT_SUCCESS(vrc))
         {