Changeset 28354 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Apr 15, 2010 12:34:53 PM (15 years ago)

Author:

vboxsync

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

60114

Message:

Guest Control: Update (lProgress handling, wait for exiting process).

File:

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

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

@@ -64 +64 @@
     RTPrintf("VBoxManage guestcontrol     execute <vmname>|<uuid>\n"
              "                            <path to program> [--arguments \"<arguments>\"] [--environment \"NAME=VALUE NAME=VALUE\"]\n"
-             "                            [--flags <flags>] [--username <name> [--password <password>]]\n"
-             "                            [--timeout <msec>] [--verbose] [--wait stdout[,[stderr]]]\n"
+             "                            [--flags <flags>] [--timeout <msec>] [--username <name> [--password <password>]\n"
+             "                            [--verbose] [--wait-for exit]\n"
              "\n");
 }
@@ -87 +87 @@
     Utf8Str Utf8UserName;
     Utf8Str Utf8Password;
-    uint32_t uTimeoutMS = RT_INDEFINITE_WAIT;
-    bool waitForOutput = false;
+    uint32_t uTimeoutMS = 0;
+    bool waitForExit = false;
+    bool waitForStdOut = false;
+    bool waitForStdErr = false;
     bool verbose = false;
 
@@ -176 +178 @@
                 ++i;
         }
-        else if (!strcmp(a->argv[i], "--wait"))
-        {
-            if (i + 1 >= a->argc)
-                usageOK = false;
-            else
-            {
-                /** @todo Check for "stdout" or "stderr"! */
-                waitForOutput = true;
+        else if (!strcmp(a->argv[i], "--wait-for"))
+        {
+            if (i + 1 >= a->argc)
+                usageOK = false;
+            else
+            {
+                if (!strcmp(a->argv[i + 1], "exit"))
+                    waitForExit = true;
+                else if (!strcmp(a->argv[i + 1], "stdout"))
+                    waitForStdOut = true;
+                else if (!strcmp(a->argv[i + 1], "stderr"))
+                    waitForStdErr = true;
+                else
+                    usageOK = false;
                 ++i;
             }
@@ -243 +251 @@
             ULONG uPID = 0;
 
-            if (verbose) RTPrintf("Waiting for guest to start process ...\n");
+            if (verbose) 
+            {
+                if (uTimeoutMS == 0)
+                    RTPrintf("Waiting for guest to start process ...\n");
+                else
+                    RTPrintf("Waiting for guest to start process (within %ums)\n", uTimeoutMS);
+            }
+
+            /* Get current time stamp to later calculate rest of timeout left. */
+            uint32_t uStartMS = RTTimeMilliTS();
+
+            /* Execute the process. */
             CHECK_ERROR_BREAK(guest, ExecuteProcess(Bstr(Utf8Cmd), uFlags,
                                                     ComSafeArrayAsInParam(args), ComSafeArrayAsInParam(env),
@@ -250 +269 @@
                                                     &uPID, progress.asOutParam()));
             if (verbose) RTPrintf("Process '%s' (PID: %u) started.\n", Utf8Cmd.raw(), uPID);
-            if (waitForOutput)
-            {
-                if (verbose) RTPrintf("Waiting for output ...\n");
-                /** @todo */
-            }
-            /** @todo Show some progress here? */
+            if (waitForExit)
+            {
+                /* Calculate timeout value left after process has been started.  */
+                if (uTimeoutMS)
+                    uTimeoutMS = uTimeoutMS - (RTTimeMilliTS() - uStartMS);
+                if (verbose)
+                {
+                    if (uTimeoutMS == 0)
+                        RTPrintf("Waiting for process to exit ...\n");
+                    else
+                        RTPrintf("Waiting for process to exit (%ums left) ...\n", uTimeoutMS);
+                }
+
+                /* Wait for process to exit ... */
+                ASSERT(progress);
+                rc = progress->WaitForCompletion(uTimeoutMS == 0 ? -1 /* Wait forever */ : uTimeoutMS);
+                if (FAILED(rc))
+                {
+                    if (uTimeoutMS)
+                        RTStrmPrintf(g_pStdErr, "Process '%s' (PID: %u) did not end within %ums! Wait aborted.\n",
+                                     Utf8Cmd.raw(), uPID, uTimeoutMS);
+                    break;
+                }
+                else
+                {
+                    BOOL completed;
+                    CHECK_ERROR_RET(progress, COMGETTER(Completed)(&completed), rc);
+                    ASSERT(completed);
+
+                    LONG iRc;
+                    CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
+
+                    if (verbose) 
+                        RTPrintf("Process completed.\n");
+
+                    /* Print output if wanted. */
+                    if (   waitForStdOut
+                        || waitForStdErr)
+                    {
+                        Bstr strOutput;
+                        CHECK_ERROR_BREAK(guest, GetProcessOutput(strOutput.asOutParam(), 0 /* @todo */));
+                        if (verbose) 
+                            RTPrintf("Output is:\n");
+                        //RTPrintf(strOutput.raw());
+                    }
+                }
+            }
             a->session->Close();
         } while (0);