Changeset 29555 in vbox for trunk

Timestamp:

May 17, 2010 2:37:48 PM (15 years ago)

Author:

vboxsync

Message:

VBoxMange: print exit status in readable form

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageGuestCtrl.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -43 +43 @@
         $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
         $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
-        $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE)
+        $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \
+        $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM)
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
  ifdef VBOX_DYNAMIC_NET_ATTACH

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

@@ -30 +30 @@
 #include <VBox/com/VirtualBox.h>
 #include <VBox/com/EventQueue.h>
+
+#include <VBox/HostServices/GuestControlSvc.h> /* for PROC_STS_XXX */
 
 #include <VBox/log.h>
@@ -85 +87 @@
 }
 
+static const char *getStatus(ULONG uStatus)
+{
+    switch (uStatus)
+    {
+        case guestControl::PROC_STS_STARTED:
+            return "started";
+        case guestControl::PROC_STS_TEN:
+            return "successfully terminated";
+        case guestControl::PROC_STS_TES:
+            return "terminated by signal";
+        case guestControl::PROC_STS_TEA:
+            return "abnormally aborted";
+        case guestControl::PROC_STS_TOK:
+            return "timed out";
+        case guestControl::PROC_STS_TOA:
+            return "timed out, hanging";
+        case guestControl::PROC_STS_DWN:
+            return "killed";
+        case guestControl::PROC_STS_ERROR:
+            return "error";
+        default:
+            return "unknown";
+    }
+}
+
 static int handleExecProgram(HandlerArg *a)
 {
@@ -101 +128 @@
     Utf8Str Utf8Password;
     uint32_t u32TimeoutMS = 0;
-    bool waitForExit = false;
-    bool waitForStdOut = false;
-    bool waitForStdErr = false;
-    bool verbose = false;
-    bool have_timeout = false;
+    bool fWaitForExit = false;
+    bool fWaitForStdOut = false;
+    bool fWaitForStdErr = false;
+    bool fVerbose = false;
+    bool fTimeout = false;
 
     /* Always use the actual command line as argv[0]. */
@@ -197 +224 @@
             else
             {
-                have_timeout = true;
+                fTimeout = true;
                 ++i;
             }
@@ -208 +235 @@
             {
                 if (!strcmp(a->argv[i + 1], "exit"))
-                    waitForExit = true;
+                    fWaitForExit = true;
                 else if (!strcmp(a->argv[i + 1], "stdout"))
                 {
-                    waitForExit = true;
-                    waitForStdOut = true;
+                    fWaitForExit = true;
+                    fWaitForStdOut = true;
                 }
                 else if (!strcmp(a->argv[i + 1], "stderr"))
                 {
-                    waitForExit = true;
-                    waitForStdErr = true;
+                    fWaitForExit = true;
+                    fWaitForStdErr = true;
                 }
                 else
@@ -226 +253 @@
         else if (!strcmp(a->argv[i], "--verbose"))
         {
-            verbose = true;
+            fVerbose = true;
         }
         /** @todo Add fancy piping stuff here. */
@@ -276 +303 @@
             ULONG uPID = 0;
 
-            if (verbose)
+            if (fVerbose)
             {
                 if (u32TimeoutMS == 0)
@@ -292 +319 @@
                                                     Bstr(Utf8UserName), Bstr(Utf8Password), u32TimeoutMS,
                                                     &uPID, progress.asOutParam()));
-            if (verbose) RTPrintf("Process '%s' (PID: %u) started\n", Utf8Cmd.raw(), uPID);
-            if (waitForExit)
-            {
-                if (have_timeout)
+            if (fVerbose) RTPrintf("Process '%s' (PID: %u) started\n", Utf8Cmd.raw(), uPID);
+            if (fWaitForExit)
+            {
+                if (fTimeout)
                 {
                     /* Calculate timeout value left after process has been started.  */
@@ -303 +330 @@
                     {
                         u32TimeoutMS = u32TimeoutMS - u64Diff;
-                        if (verbose)
+                        if (fVerbose)
                             RTPrintf("Waiting for process to exit (%ums left) ...\n", u32TimeoutMS);
                     }
                     else
                     {
-                        if (verbose)
+                        if (fVerbose)
                             RTPrintf("No time left to wait for process!\n");
                     }
                 }
-                else if (verbose)
+                else if (fVerbose)
                     RTPrintf("Waiting for process to exit ...\n");
 
@@ -341 +368 @@
                      */
 
-                    if (   waitForStdOut
-                        || waitForStdErr)
+                    if (   fWaitForStdOut
+                        || fWaitForStdErr)
                     {
                         CHECK_ERROR_BREAK(guest, GetProcessOutput(uPID, 0 /* aFlags */,
@@ -375 +402 @@
                             break;
 
-                        if (   have_timeout
+                        if (   fTimeout
                             && RTTimeMilliTS() - u64StartMS > u32TimeoutMS + 5000)
                         {
@@ -426 +453 @@
                             RTPrintf("\n");
                         }
-                        if (verbose)
+                        if (fVerbose)
                         {
                             ULONG uRetStatus, uRetExitCode, uRetFlags;
                             CHECK_ERROR_BREAK(guest, GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &uRetStatus));
-                            RTPrintf("Exit code=%u (Status=%u, Flags=%u)\n", uRetExitCode, uRetStatus, uRetFlags);
+                            RTPrintf("Exit code=%u (Status=%u [%s], Flags=%u)\n", uRetExitCode, uRetStatus, getStatus(uRetStatus), uRetFlags);
                         }
                     }