Changeset 47491 in vbox for trunk/src/VBox

Timestamp:

Jul 31, 2013 1:25:44 PM (11 years ago)

Author:

vboxsync

Message:

FE/VBoxManage/GuestCtrl: Don't close a guest session when starting a detached guest process, print guest process status when listing, output formatting bugfixes.

File:

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

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

@@ -829 +829 @@
         }
 
-        Assert(sessionWaitResult == GuestSessionWaitResult_Start);
+        Assert(   sessionWaitResult == GuestSessionWaitResult_Start
+               /* Note: This might happen when Guest Additions < 4.3 are installed which don't
+                *       support dedicated guest sessions. */
+               || sessionWaitResult == GuestSessionWaitResult_WaitFlagNotSupported);
         if (fVerbose)
             RTPrintf("Guest session has been started\n");
@@ -910 +913 @@
                         /* Just print plain PID to make it easier for scripts
                          * invoking VBoxManage. */
-                        RTPrintf("%ul\n", uPID);
+                        RTPrintf("%ld\n", uPID);
                     }
 
@@ -1014 +1017 @@
     } while (0);
 
-    if (fVerbose)
-        RTPrintf("Closing guest session ...\n");
-    rc = pGuestSession->Close();
-    if (FAILED(rc))
-    {
-        ctrlPrintError(pGuestSession, COM_IIDOF(ISession));
-
-        if (rcExit == RTEXITCODE_SUCCESS)
-            rcExit = RTEXITCODE_FAILURE;
-    }
+    /*
+     * Only close the guest session if we waited for the guest
+     * process to exit. Otherwise we wouldn't have any chance to
+     * access and/or kill detached guest process lateron.
+     */
+    if (fWaitForExit)
+    {
+        if (fVerbose)
+            RTPrintf("Closing guest session ...\n");
+        rc = pGuestSession->Close();
+        if (FAILED(rc))
+        {
+            ctrlPrintError(pGuestSession, COM_IIDOF(ISession));
+
+            if (rcExit == RTEXITCODE_SUCCESS)
+                rcExit = RTEXITCODE_FAILURE;
+        }
+    }
+    else if (fVerbose)
+        RTPrintf("Guest session detached\n");
 
     return rcExit;
@@ -2813 +2826 @@
         || fListSessions)
     {
-        RTPrintf("Active guest sessions:\n");
-
         HRESULT rc;
         do
@@ -2822 +2833 @@
             SafeIfaceArray <IGuestSession> collSessions;
             CHECK_ERROR_BREAK(guest, COMGETTER(Sessions)(ComSafeArrayAsOutParam(collSessions)));
-            for (size_t i = 0; i < collSessions.size(); i++)
-            {
-                ComPtr<IGuestSession> pCurSession = collSessions[i];
-                if (!pCurSession.isNull())
+            size_t cSessions = collSessions.size();
+
+            if (cSessions)
+            {
+                RTPrintf("Active guest sessions:\n");
+
+                /** @todo Make this output a bit prettier. No time now. */
+
+                for (size_t i = 0; i < cSessions; i++)
                 {
-                    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 #%zu: ID=%RU32, User=%ls, Name=%ls",
-                             i, uID, strUser.raw(), strName.raw());
-
-                    if (   fListAll
-                        || fListProcesses)
+                    ComPtr<IGuestSession> pCurSession = collSessions[i];
+                    if (!pCurSession.isNull())
                     {
-                        SafeIfaceArray <IGuestProcess> collProcesses;
-                        CHECK_ERROR_BREAK(pCurSession, COMGETTER(Processes)(ComSafeArrayAsOutParam(collProcesses)));
-                        for (size_t a = 0; a < collProcesses.size(); a++)
+                        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());
+
+                        if (   fListAll
+                            || fListProcesses)
                         {
-                            ComPtr<IGuestProcess> pCurProcess = collProcesses[a];
-                            if (!pCurProcess.isNull())
+                            SafeIfaceArray <IGuestProcess> collProcesses;
+                            CHECK_ERROR_BREAK(pCurSession, COMGETTER(Processes)(ComSafeArrayAsOutParam(collProcesses)));
+                            for (size_t a = 0; a < collProcesses.size(); a++)
                             {
-                                ULONG uPID;
-                                CHECK_ERROR_BREAK(pCurProcess, COMGETTER(PID)(&uPID));
-                                Bstr strExecPath;
-                                CHECK_ERROR_BREAK(pCurProcess, COMGETTER(ExecutablePath)(strExecPath.asOutParam()));
-
-                                RTPrintf("\n\t\tProcess #%zu: PID=%RU32, CmdLine=%ls",
-                                         i, uPID, strExecPath.raw());
+                                ComPtr<IGuestProcess> pCurProcess = collProcesses[a];
+                                if (!pCurProcess.isNull())
+                                {
+                                    ULONG uPID;
+                                    CHECK_ERROR_BREAK(pCurProcess, COMGETTER(PID)(&uPID));
+                                    Bstr strExecPath;
+                                    CHECK_ERROR_BREAK(pCurProcess, COMGETTER(ExecutablePath)(strExecPath.asOutParam()));
+                                    ProcessStatus_T status;
+                                    CHECK_ERROR_BREAK(pCurProcess, COMGETTER(Status)(&status));
+
+                                    RTPrintf("\n\t\tProcess #%-03zu PID=%-6RU32 Status=[%s] Command=%ls",
+                                             a, uPID, ctrlExecProcessStatusToText(status), strExecPath.raw());
+                                }
                             }
+
+                            cTotalProcs += collProcesses.size();
                         }
-
-                        cTotalProcs += collProcesses.size();
                     }
                 }
-            }
-
-            RTPrintf("\n\nTotal guest sessions: %zu", collSessions.size());
-            RTPrintf("\n\nTotal guest processes: %zu", cTotalProcs);
+
+                RTPrintf("\n\nTotal guest sessions: %zu\n", collSessions.size());
+                RTPrintf("Total guest processes: %zu\n", cTotalProcs);
+            }
+            else
+                RTPrintf("No active guest sessions found\n");
 
         } while (0);