Changeset 49439 in vbox for trunk/src/VBox

Timestamp:

Nov 11, 2013 3:30:42 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90546

Message:

FE/VBoxManage: GuestCtrl: Explicitly wait for guest process to start, a bit more work on detached process handling.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (8 diffs)

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

@@ -559 +559 @@
 }
 
+const char *ctrlProcessWaitResultToText(ProcessWaitResult_T enmWaitResult)
+{
+    switch (enmWaitResult)
+    {
+        case ProcessWaitResult_Start:
+            return "started";
+        case ProcessWaitResult_Terminate:
+            return "terminated";
+        case ProcessWaitResult_Status:
+            return "status changed";
+        case ProcessWaitResult_Error:
+            return "error";
+        case ProcessWaitResult_Timeout:
+            return "timed out";
+        case ProcessWaitResult_StdIn:
+            return "stdin ready";
+        case ProcessWaitResult_StdOut:
+            return "data on stdout";
+        case ProcessWaitResult_StdErr:
+            return "data on stderr";
+        case ProcessWaitResult_WaitFlagNotSupported:
+            return "waiting flag not supported";
+        default:
+            break;
+    }
+    return "unknown";
+}
+
 /**
  * Translates a guest session status to a human readable
@@ -1254 +1282 @@
             {
                 if (cMsTimeout == 0)
-                    RTPrintf("Waiting for guest process to start ...\n");
+                    RTPrintf("Starting guest process ...\n");
                 else
-                    RTPrintf("Waiting for guest process to start (within %ums)\n", cMsTimeout);
+                    RTPrintf("Starting guest process (within %ums)\n", cMsTimeout);
             }
 
@@ -1267 +1295 @@
                                                                  ComSafeArrayAsInParam(aEnv),
                                                                  ComSafeArrayAsInParam(aCreateFlags),
-                                                                 cMsTimeout,
+                                                                 ctrlExecGetRemainingTime(u64StartMS, cMsTimeout),
                                                                  pProcess.asOutParam()));
 
-            /** @todo does this need signal handling? there's no progress object etc etc */
+            /*
+             * Explicitly wait for the guest process to be in a started
+             * state.
+             */
+            com::SafeArray<ProcessWaitForFlag_T> aWaitStartFlags;
+            aWaitStartFlags.push_back(ProcessWaitForFlag_Start);
+            ProcessWaitResult_T waitResult;
+            CHECK_ERROR_BREAK(pProcess, WaitForArray(ComSafeArrayAsInParam(aWaitStartFlags),
+                                                     ctrlExecGetRemainingTime(u64StartMS, cMsTimeout), &waitResult));
+            bool fCompleted = false;
+
+            ULONG uPID = 0;
+            CHECK_ERROR_BREAK(pProcess, COMGETTER(PID)(&uPID));
+            if (!fDetached && pCtx->fVerbose)
+            {
+                RTPrintf("Process '%s' (PID %RU32) started\n",
+                         strCmd.c_str(), uPID);
+            }
+            else if (fDetached) /** @todo Introduce a --quiet option for not printing this. */
+            {
+                /* Just print plain PID to make it easier for scripts
+                 * invoking VBoxManage. */
+                RTPrintf("[%RU32 - Session %RU32]\n", uPID, pCtx->uSessionID);
+            }
 
             vrc = RTStrmSetMode(g_pStdOut, 1 /* Binary mode */, -1 /* Code set, unchanged */);
@@ -1280 +1331 @@
 
             /* Wait for process to exit ... */
-            RTMSINTERVAL cMsTimeLeft = 1;
+            RTMSINTERVAL cMsTimeLeft = 1; /* Will be calculated. */
             bool fReadStdOut, fReadStdErr;
             fReadStdOut = fReadStdErr = false;
 
-            bool fCompleted = false;
-            while (!fCompleted && cMsTimeLeft != 0)
+            while (   !fCompleted
+                   && !fDetached
+                   && cMsTimeLeft != 0)
             {
                 cMsTimeLeft = ctrlExecGetRemainingTime(u64StartMS, cMsTimeout);
-                ProcessWaitResult_T waitResult;
                 CHECK_ERROR_BREAK(pProcess, WaitForArray(ComSafeArrayAsInParam(aWaitFlags),
                                                          cMsTimeLeft, &waitResult));
@@ -1295 +1346 @@
                     case ProcessWaitResult_Start:
                     {
-                        ULONG uPID = 0;
-                        CHECK_ERROR_BREAK(pProcess, COMGETTER(PID)(&uPID));
-                        if (pCtx->fVerbose)
-                        {
-                            RTPrintf("Process '%s' (PID %RU32) started\n",
-                                     strCmd.c_str(), uPID);
-                        }
-                        else /** @todo Introduce a --quiet option for not printing this. */
-                        {
-                            /* Just print plain PID to make it easier for scripts
-                             * invoking VBoxManage. */
-                            RTPrintf("%RU32, session ID %RU32\n", uPID, pCtx->uSessionID);
-                        }
-
                         /* We're done here if we don't want to wait for termination. */
                         if (fDetached)
@@ -1322 +1359 @@
                         break;
                     case ProcessWaitResult_Terminate:
-                        /* Process terminated, we're done */
+                        if (pCtx->fVerbose)
+                            RTPrintf("Process terminated\n");
+                        /* Process terminated, we're done. */
                         fCompleted = true;
                         break;
@@ -1372 +1411 @@
             } /* while */
 
-            /* Report status back to the user. */
-            if (   fCompleted
-                && !g_fGuestCtrlCanceled)
+            if (!fDetached)
             {
-                ProcessStatus_T procStatus;
-                CHECK_ERROR_BREAK(pProcess, COMGETTER(Status)(&procStatus));
-                if (   procStatus == ProcessStatus_TerminatedNormally
-                    || procStatus == ProcessStatus_TerminatedAbnormally
-                    || procStatus == ProcessStatus_TerminatedSignal)
+                /* Report status back to the user. */
+                if (   fCompleted
+                    && !g_fGuestCtrlCanceled)
                 {
-                    LONG exitCode;
-                    CHECK_ERROR_BREAK(pProcess, COMGETTER(ExitCode)(&exitCode));
+
+                    {
+                        ProcessStatus_T procStatus;
+                        CHECK_ERROR_BREAK(pProcess, COMGETTER(Status)(&procStatus));
+                        if (   procStatus == ProcessStatus_TerminatedNormally
+                            || procStatus == ProcessStatus_TerminatedAbnormally
+                            || procStatus == ProcessStatus_TerminatedSignal)
+                        {
+                            LONG exitCode;
+                            CHECK_ERROR_BREAK(pProcess, COMGETTER(ExitCode)(&exitCode));
+                            if (pCtx->fVerbose)
+                                RTPrintf("Exit code=%u (Status=%u [%s])\n",
+                                         exitCode, procStatus, ctrlProcessStatusToText(procStatus));
+
+                            rcExit = (RTEXITCODE)ctrlExecProcessStatusToExitCode(procStatus, exitCode);
+                        }
+                        else if (pCtx->fVerbose)
+                            RTPrintf("Process now is in status [%s]\n", ctrlProcessStatusToText(procStatus));
+                    }
+                }
+                else
+                {
                     if (pCtx->fVerbose)
-                        RTPrintf("Exit code=%u (Status=%u [%s])\n",
-                                 exitCode, procStatus, ctrlProcessStatusToText(procStatus));
-
-                    rcExit = (RTEXITCODE)ctrlExecProcessStatusToExitCode(procStatus, exitCode);
+                        RTPrintf("Process execution aborted!\n");
+
+                    rcExit = (RTEXITCODE)EXITCODEEXEC_TERM_ABEND;
                 }
-                else if (pCtx->fVerbose)
-                    RTPrintf("Process now is in status [%s]\n", ctrlProcessStatusToText(procStatus));
             }
-            else
-            {
-                if (pCtx->fVerbose)
-                    RTPrintf("Process execution aborted!\n");
-
-                rcExit = (RTEXITCODE)EXITCODEEXEC_TERM_ABEND;
-            }
 
         } while (0);
@@ -1408 +1453 @@
     }
 
+    /*
+     * Decide what to do with the guest session. If we started a
+     * detached guest process (that is, without waiting for it to exit),
+     * don't close the guest session it is part of.
+     */
     bool fCloseSession = false;
     if (SUCCEEDED(rc))