Changeset 5204 in vbox

Timestamp:

Oct 9, 2007 1:54:46 PM (17 years ago)

Author:

vboxsync

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

25131

Message:

Added a vmstatistics command.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (2 diffs)
• VBoxManage.cpp (modified) (5 diffs)
• VBoxManage.h (modified) (6 diffs)
• VBoxManageSVN.cpp (modified) (2 diffs)

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

@@ -51 +51 @@
 
 /** flag whether we're in internal mode */
-bool fInternalMode;
+bool g_fInternalMode;
 
 /**
@@ -400 +400 @@
                            ComPtr <IVirtualBox> aVirtualBox, ComPtr<ISession> aSession)
 {
-    fInternalMode = true;
+    g_fInternalMode = true;
 
     /* at least a command is required */

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

@@ -596 +596 @@
                  "\n");
     }
+
+    if (u64Cmd & USAGE_VM_STATISTICS)
+    {
+        RTPrintf("VBoxManage vmstatistics     <vmname>|<uuid>\n"
+                 "                            [-pattern <pattern>] [-descriptions]\n"
+                 "\n");
+    }
 }
 
@@ -605 +612 @@
     va_list args;
     showLogo(); // show logo even if suppressed
-    if (fInternalMode)
+    if (g_fInternalMode)
         printUsageInternal(u64Cmd);
     else
@@ -4794 +4801 @@
                 u32LineSpeed = atoi(nicspeed[n]);
 
-                if (u32LineSpeed < 1000 || u32LineSpeed > 4000000) 
+                if (u32LineSpeed < 1000 || u32LineSpeed > 4000000)
                 {
                     errorArgument("Invalid -nicspeed%lu argument '%s'", n + 1, nicspeed[n]);
                     rc = E_FAIL;
                     break;
-                } 
-                else 
-                {
-                    CHECK_ERROR_RET(nic, COMSETTER(LineSpeed)(u32LineSpeed), 1);
-                }
+                }
+                CHECK_ERROR_RET(nic, COMSETTER(LineSpeed)(u32LineSpeed), 1);
             }
 
@@ -6999 +7003 @@
     }
     return 0;
+}
+
+static int handleVMStatistics(int argc, char *argv[],
+                              ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession)
+{
+    HRESULT rc;
+
+    /* at least one option: the UUID or name of the VM */
+    if (argc < 1)
+        return errorSyntax(USAGE_VM_STATISTICS, "Incorrect number of parameters");
+
+    /* try to find the given machine */
+    ComPtr <IMachine> machine;
+    Guid uuid (argv[0]);
+    if (!uuid.isEmpty())
+        CHECK_ERROR(aVirtualBox, GetMachine(uuid, machine.asOutParam()));
+    else
+    {
+        CHECK_ERROR(aVirtualBox, FindMachine(Bstr(argv[0]), machine.asOutParam()));
+        if (SUCCEEDED (rc))
+            machine->COMGETTER(Id)(uuid.asOutParam());
+    }
+    if (FAILED(rc))
+        return 1;
+
+    /*  */
+    bool fWithDescriptions = false;
+    const char *pszPattern = NULL; /* all */
+    for (int i = 1; i < argc; i++)
+    {
+        if (!strcmp(argv[i], "-pattern"))
+        {
+            if (pszPattern)
+                return errorSyntax(USAGE_VM_STATISTICS, "Multiple -patterns options is not permitted");
+            if (i + 1 >= argc)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            pszPattern = argv[++i];
+        }
+        else if (!strcmp(argv[i], "-descriptions"))
+            fWithDescriptions = true;
+        /* add: -file <filename> and -formatted */
+        else
+            return errorSyntax(USAGE_VM_STATISTICS, "Unknown option '%s'", argv[i]);
+    }
+
+    /* open an existing session for the VM. */
+    CHECK_ERROR(aVirtualBox, OpenExistingSession(aSession, uuid));
+    if (SUCCEEDED(rc))
+    {
+        /* get the session console. */
+        ComPtr <IConsole> console;
+        CHECK_ERROR(aSession, COMGETTER(Console)(console.asOutParam()));
+        if (SUCCEEDED(rc))
+        {
+            /* get the machine debugger. */
+            ComPtr <IMachineDebugger> debugger;
+            CHECK_ERROR(console, COMGETTER(Debugger)(debugger.asOutParam()));
+            if (SUCCEEDED(rc))
+            {
+                if (1/*fDumpStats*/)
+                {
+                    Bstr stats;
+                    CHECK_ERROR(debugger, GetStats(Bstr(pszPattern).raw(), fWithDescriptions, stats.asOutParam()));
+                    if (SUCCEEDED(rc))
+                    {
+                        RTPrintf("%ls\n", stats.raw());
+                    }
+                }
+            }
+            aSession->Close();
+        }
+    }
+
+    return SUCCEEDED(rc) ? 0 : 1;
 }
 
@@ -7388 +7466 @@
         { "usbfilter",        handleUSBFilter },
         { "sharedfolder",     handleSharedFolder },
+        { "vmstatistics",     handleVMStatistics },
         { NULL,               NULL }
     };

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -1 +1 @@
 /** @file
- *
  * VBox frontends: VBoxManage (command-line interface):
  * VBoxManage header.
@@ -17 +16 @@
  */
 
-#ifndef __H_VBOXMANAGE
-#define __H_VBOXMANAGE
+#ifndef ___H_VBOXMANAGE
+#define ___H_VBOXMANAGE
 
 #include <iprt/types.h>
@@ -24 +23 @@
 #include <VBox/com/VirtualBox.h>
 
-/** Syntax diagram category. */
+/** @name Syntax diagram category.
+ * @{ */
 #define USAGE_DUMPOPTS              0
 #define USAGE_LIST                  BIT64(0)
@@ -61 +61 @@
 #define USAGE_CONVERTDD             BIT64(32)
 #ifdef VBOX_OSE
-#define USAGE_LISTPARTITIONS        (0)
-#define USAGE_CREATERAWVMDK         (0)
+# define USAGE_LISTPARTITIONS       (0)
+# define USAGE_CREATERAWVMDK        (0)
 #else /* !VBOX_OSE */
-#define USAGE_LISTPARTITIONS        BIT64(33)
-#define USAGE_CREATERAWVMDK         BIT64(34)
+# define USAGE_LISTPARTITIONS       BIT64(33)
+# define USAGE_CREATERAWVMDK        BIT64(34)
 #endif /* !VBOX_OSE */
+#define USAGE_VM_STATISTICS         BIT64(35)
 #define USAGE_ALL                   (~(uint64_t)0)
+/** @} */
 
 typedef uint64_t USAGECATEGORY;
 
 /** flag whether we're in internal mode */
-extern bool fInternalMode;
+extern bool g_fInternalMode;
 
 /** showVMInfo details */
@@ -78 +80 @@
 {
     VMINFO_NONE             = 0,
-    VMINFO_STANDARD         = 1,    /* standard details */
-    VMINFO_STATISTICS       = 2,    /* guest statistics */
-    VMINFO_FULL             = 3,    /* both */
-    VMINFO_MACHINEREADABLE  = 4,    /* both, and make it machine readable */
+    VMINFO_STANDARD         = 1,    /**< standard details */
+    VMINFO_STATISTICS       = 2,    /**< guest statistics */
+    VMINFO_FULL             = 3,    /**< both */
+    VMINFO_MACHINEREADABLE  = 4     /**< both, and make it machine readable */
 } VMINFO_DETAILS;
 
@@ -93 +95 @@
 int handleInternalCommands(int argc, char *argv[],
                            ComPtr <IVirtualBox> aVirtualBox, ComPtr<ISession> aSession);
-unsigned long VBoxSVNRev ();
+unsigned long VBoxSVNRev();
 
-#endif /* !__H_VBOXMANAGE */
+#endif /* !___H_VBOXMANAGE */

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * VBox frontends: VBoxManage (command-line interface):
  * SVN revision.
@@ -26 +26 @@
  * the version number is requested.
  */
-unsigned long VBoxSVNRev ()
+unsigned long VBoxSVNRev()
 {
     return VBOX_SVN_REV;
 }
+