Changeset 4649

Timestamp:

09/10/07 10:50:51 (1 year ago)

Author:

vboxsync

Message:

showvminfo -statistics

Files:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (6 diffs)
• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)

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

@@ -278 +278 @@
-        RTPrintf("VBoxManage showvminfo       <uuid>|<name>\n"
-                 "                            [-details]\n"
+                 "                            [-statistics]\n"
-                 "\n");
-    }
@@ -705 +706 @@
-static HRESULT showVMInfo (ComPtr <IVirtualBox> virtualBox, ComPtr<IMachine> machine,
-                           ComPtr <IConsole> console = ComPtr <IConsole> (),
-bool fDetails = false
+VMINFO_DETAILS details = VMINFO_NONE
-{
-    HRESULT rc;
@@ -1536 +1537 @@
-    }
-
-fDetails
+details == VMINFO_STANDARD || details == VMINFO_FULL
-    {
-        Bstr description;
@@ -1544 +1545 @@
-            RTPrintf("Description:\n%lS\n", description.raw());
-        }
+    }
+    if (details == VMINFO_STATISTICS || details == VMINFO_FULL)
+    {
+        ComPtr <IGuest> Guest;
+        ULONG statVal;
+
+        CHECK_ERROR_RET(console, COMGETTER(Guest)(Guest.asOutParam()), rc);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_CPULoad_Idle, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: CPU Load Idle          %-3d%%\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_CPULoad_Kernel, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: CPU Load Kernel        %-3d%%\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_CPULoad_User, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: CPU Load User          %-3d%%\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_Threads, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Threads                %d%%\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_Processes, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Processes              %d%%\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_Handles, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Handles                %d%%\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_MemoryLoad, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Memory Load            %d%%\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_PhysMemTotal, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Total physical memory  %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_PhysMemAvailable, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Free physical memory   %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_PhysMemBalloon, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Memory balloon size    %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_MemCommitTotal, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Committed memory       %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_MemKernelTotal, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Total kernel memory    %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_MemKernelPaged, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Paged kernel memory    %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_MemKernelNonpaged, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Nonpaged kernel memory %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_MemSystemCache, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: System cache size      %-4d MB\n", 0, statVal);
+
+        rc = Guest->GetStatistic(0, GuestStatisticType_PageFileSize, &statVal);
+        if (rc == S_OK)
+            RTPrintf("CPU%d: Page file size         %-4d MB\n", 0, statVal);
-    }
-
@@ -1588 +1660 @@
-        return 1;
-
-
+
+
-    bool fDetails = false;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    ComPtr <IConsole> console;
@@ -1604 +1692 @@
-        rc = session->COMGETTER(Console)(console.asOutParam());
-
-fD
+d
-
-    if (console)

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

@@ -70 +70 @@
-extern bool fInternalMode;
-
+/** showVMInfo details */
+typedef enum
+{
+    VMINFO_NONE         = 0,
+    VMINFO_STANDARD     = 1,    /* standard details */
+    VMINFO_STATISTICS   = 2,    /* guest statistics */
+    VMINFO_FULL         = 3,    /* both */
+} VMINFO_DETAILS;
+
-/*
- * Prototypes