Changeset 47859 in vbox

Timestamp:

Aug 19, 2013 9:06:45 PM (11 years ago)

Author:

vboxsync

Message:

FE/VBoxManage: Also show guest files when using "watch".

Location:

trunk

Files:

• doc/manual/en_US/user_VBoxManage.xml (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (10 diffs)

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -3263 +3263 @@
         <listitem>
           <para><emphasis role="bold"><computeroutput>list</computeroutput></emphasis>,
-          which lists various guest control information such as open guest sessions and
-          guest processes.</para>
+          which lists various guest control information such as open guest sessions,
+          guest processes and guest files.</para>
 
           <screen>VBoxManage guestcontrol &lt;uuid|vmname&gt; list
-            &lt;all|sessions|processes&gt; [--verbose]</screen>
+            &lt;all|sessions|processes|files&gt; [--verbose]</screen>
 
           <para>where the parameters mean: <glosslist>
@@ -3279 +3279 @@
 
             <glossentry>
-              <glossterm><computeroutput>all|sessions|processes</computeroutput></glossterm>
+              <glossterm><computeroutput>all|sessions|processes|files</computeroutput></glossterm>
 
               <glossdef>
-                <para>Whether to list guest sessions, guest processes or all information
-                  available.</para>
+                <para>Whether to list guest sessions, guest processes, guest files
+                  or all information available. Mandatory.</para>
               </glossdef>
             </glossentry>

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

@@ -83 +83 @@
     void uninit(void)
     {
+        mSession.setNull();
     }
 
@@ -89 +90 @@
         switch (aType)
         {
+            case VBoxEventType_OnGuestFileRegistered:
+                break;
+
+            case VBoxEventType_OnGuestProcessRegistered:
+                break;
+
             case VBoxEventType_OnGuestSessionRegistered:
             {
-                ComPtr<IGuestSessionRegisteredEvent> pEvent = aEvent;
-                Assert(!pEvent.isNull());
-
-                ComPtr<IGuestSession> pSession;
-                HRESULT rc = pEvent->COMGETTER(Session)(pSession.asOutParam());
-                AssertComRCBreakRC(rc);
-                AssertBreak(!pSession.isNull());
-
-                BOOL fRegistered;
-                rc = pEvent->COMGETTER(Registered)(&fRegistered);
-                AssertComRCBreakRC(rc);
-
-                Bstr strName;
-                rc = pSession->COMGETTER(Name)(strName.asOutParam());
-                AssertComRCBreakRC(rc);
-                ULONG uID;
-                rc = pSession->COMGETTER(Id)(&uID);
-                AssertComRCBreakRC(rc);
-
-                RTPrintf("Session ID=%RU32 \"%s\" %s\n",
-                         uID, Utf8Str(strName).c_str(),
-                         fRegistered ? "registered" : "unregistered");
-
-                pSession.setNull();
+                HRESULT rc;
+                do
+                {
+                    ComPtr<IGuestSessionRegisteredEvent> pEvent = aEvent;
+                    Assert(!pEvent.isNull());
+
+                    CHECK_ERROR_BREAK(pEvent, COMGETTER(Session)(mSession.asOutParam()));
+                    AssertBreak(!mSession.isNull());
+                    BOOL fRegistered;
+                    CHECK_ERROR_BREAK(pEvent, COMGETTER(Registered)(&fRegistered));
+                    Bstr strName;
+                    CHECK_ERROR_BREAK(mSession, COMGETTER(Name)(strName.asOutParam()));
+                    ULONG uID;
+                    CHECK_ERROR_BREAK(mSession, COMGETTER(Id)(&uID));
+
+                    RTPrintf("Session ID=%RU32 \"%s\" %s\n",
+                             uID, Utf8Str(strName).c_str(),
+                             fRegistered ? "registered" : "unregistered");
+                    if (fRegistered)
+                    {
+                    #if 0
+                        /* Register for IGuestSession events. */
+                        ComPtr<IEventSource> es;
+                        CHECK_ERROR_BREAK(pSession, COMGETTER(EventSource)(es.asOutParam()));
+                        com::SafeArray<VBoxEventType_T> eventTypes;
+                        eventTypes.push_back(VBoxEventType_OnGuestFileRegistered);
+                        eventTypes.push_back(VBoxEventType_OnGuestProcessRegistered);
+                        CHECK_ERROR_BREAK(es, RegisterListener(this, ComSafeArrayAsInParam(eventTypes),
+                                                               true /* Active listener */));
+                    #endif
+                    }
+                    else
+                    {
+                        mSession.setNull();
+                    }
+
+                } while (0);
                 break;
             }
@@ -124 +144 @@
         return S_OK;
     }
+
+protected:
+
+    ComPtr<IGuestSession> mSession;
 };
 typedef ListenerImpl<GuestEventListener> GuestEventListenerImpl;
@@ -329 +353 @@
                  "                            [--domain <domain>] [--mode <mode>] [--verbose]\n"
                  "\n"
-                 "                            list <all|sessions|processes> [--verbose]\n"
+                 "                            list <all|sessions|processes|files> [--verbose]\n"
                  "\n"
                  /** @todo Add an own help group for "session" and "process" sub commands. */
@@ -560 +584 @@
 }
 
+/**
+ * Translates a guest file status to a human readable
+ * string.
+ */
+static const char *ctrlFileStatusToText(FileStatus_T enmStatus)
+{
+    switch (enmStatus)
+    {
+        case FileStatus_Opening:
+            return "opening";
+        case FileStatus_Open:
+            return "open";
+        case FileStatus_Closing:
+            return "closing";
+        case FileStatus_Closed:
+            return "closed";
+        case FileStatus_Down:
+            return "killed";
+        case FileStatus_Error:
+            return "error";
+        default:
+            break;
+    }
+    return "unknown";
+}
+
 static int ctrlPrintError(com::ErrorInfo &errorInfo)
 {
@@ -2979 +3029 @@
     bool fListSessions = false;
     bool fListProcesses = false;
+    bool fListFiles = false;
     if (   !RTStrICmp(pArg->argv[0], "sessions")
         || !RTStrICmp(pArg->argv[0], "sess"))
@@ -2985 +3036 @@
              || !RTStrICmp(pArg->argv[0], "procs"))
         fListSessions = fListProcesses = true; /* Showing processes implies showing sessions. */
+    else if (   !RTStrICmp(pArg->argv[0], "files"))
+        fListSessions = fListFiles = true;     /* Showing files implies showing sessions. */
     else if (!RTStrICmp(pArg->argv[0], "all"))
         fListAll = true;
@@ -2998 +3051 @@
         {
             size_t cTotalProcs = 0;
+            size_t cTotalFiles = 0;
 
             SafeIfaceArray <IGuestSession> collSessions;
@@ -3049 +3103 @@
                             cTotalProcs += collProcesses.size();
                         }
+
+                        if (   fListAll
+                            || fListFiles)
+                        {
+                            SafeIfaceArray <IGuestFile> collFiles;
+                            CHECK_ERROR_BREAK(pCurSession, COMGETTER(Files)(ComSafeArrayAsOutParam(collFiles)));
+                            for (size_t a = 0; a < collFiles.size(); a++)
+                            {
+                                ComPtr<IGuestFile> pCurFile = collFiles[a];
+                                if (!pCurFile.isNull())
+                                {
+                                    ULONG uID;
+                                    CHECK_ERROR_BREAK(pCurFile, COMGETTER(Id)(&uID));
+                                    Bstr strName;
+                                    CHECK_ERROR_BREAK(pCurFile, COMGETTER(FileName)(strName.asOutParam()));
+                                    FileStatus_T fileStatus;
+                                    CHECK_ERROR_BREAK(pCurFile, COMGETTER(Status)(&fileStatus));
+
+                                    RTPrintf("\n\t\tFile #%-03zu PID=%-6RU32 Status=[%s] Name=%ls",
+                                             a, uID, ctrlFileStatusToText(fileStatus), strName.raw());
+                                }
+                            }
+
+                            cTotalFiles += collFiles.size();
+                        }
                     }
                 }
 
                 RTPrintf("\n\nTotal guest sessions: %zu\n", collSessions.size());
-                RTPrintf("Total guest processes: %zu\n", cTotalProcs);
+                if (fListAll || fListProcesses)
+                    RTPrintf("Total guest processes: %zu\n", cTotalProcs);
+                if (fListAll || fListFiles)
+                    RTPrintf("Total guest files: %zu\n", cTotalFiles);
             }
             else
@@ -3480 +3562 @@
     {
         ComObjPtr<GuestEventListenerImpl> pGuestListener;
-
-
-
         do
         {