Changeset 47538 in vbox for trunk/src/VBox

Timestamp:

Aug 5, 2013 10:18:26 AM (11 years ago)

Author:

vboxsync

Message:

FE/VBoxManage/GuestCtrl: Include guest session status when listing.

File:

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

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

@@ -403 +403 @@
 }
 
+/**
+ * Translates a guest session status to a human readable
+ * string.
+ */
+static const char *ctrlSessionStatusToText(GuestSessionStatus_T enmStatus)
+{
+    switch (enmStatus)
+    {
+        case GuestSessionStatus_Starting:
+            return "starting";
+        case GuestSessionStatus_Started:
+            return "started";
+        case GuestSessionStatus_Terminating:
+            return "terminating";
+        case GuestSessionStatus_Terminated:
+            return "terminated";
+        case GuestSessionStatus_TimedOutKilled:
+            return "timed out";
+        case GuestSessionStatus_TimedOutAbnormally:
+            return "timed out, hanging";
+        case GuestSessionStatus_Down:
+            return "killed";
+        case GuestSessionStatus_Error:
+            return "error";
+        default:
+            break;
+    }
+    return "unknown";
+}
+
 static int ctrlPrintError(com::ErrorInfo &errorInfo)
 {
@@ -2856 +2886 @@
                     if (!pCurSession.isNull())
                     {
+                        ULONG uID;
+                        CHECK_ERROR_BREAK(pCurSession, COMGETTER(Id)(&uID));
                         Bstr strName;
                         CHECK_ERROR_BREAK(pCurSession, COMGETTER(Name)(strName.asOutParam()));
                         Bstr strUser;
                         CHECK_ERROR_BREAK(pCurSession, COMGETTER(User)(strUser.asOutParam()));
-                        ULONG uID;
-                        CHECK_ERROR_BREAK(pCurSession, COMGETTER(Id)(&uID));
-
-                        RTPrintf("\n\tSession #%-3zu ID=%-3RU32 User=%-16ls Name=%ls",
-                                 i, uID, strUser.raw(), strName.raw());
+                        GuestSessionStatus_T sessionStatus;
+                        CHECK_ERROR_BREAK(pCurSession, COMGETTER(Status)(&sessionStatus));
+                        RTPrintf("\n\tSession #%-3zu ID=%-3RU32 User=%-16ls Status=[%s] Name=%ls",
+                                 i, uID, strUser.raw(), ctrlSessionStatusToText(sessionStatus), strName.raw());
 
                         if (   fListAll
@@ -2880 +2911 @@
                                     Bstr strExecPath;
                                     CHECK_ERROR_BREAK(pCurProcess, COMGETTER(ExecutablePath)(strExecPath.asOutParam()));
-                                    ProcessStatus_T status;
-                                    CHECK_ERROR_BREAK(pCurProcess, COMGETTER(Status)(&status));
+                                    ProcessStatus_T procStatus;
+                                    CHECK_ERROR_BREAK(pCurProcess, COMGETTER(Status)(&procStatus));
 
                                     RTPrintf("\n\t\tProcess #%-03zu PID=%-6RU32 Status=[%s] Command=%ls",
-                                             a, uPID, ctrlExecProcessStatusToText(status), strExecPath.raw());
+                                             a, uPID, ctrlExecProcessStatusToText(procStatus), strExecPath.raw());
                                 }
                             }