Changeset 27822 in vbox for trunk/src

Timestamp:

Mar 30, 2010 1:01:36 PM (15 years ago)

Author:

vboxsync

Message:

Removed guest statistics interface; to be merged with metrics.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (5 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• Main/GuestImpl.cpp (modified) (5 diffs)
• Main/MachineImpl.cpp (modified) (2 diffs)
• Main/Performance.cpp (modified) (1 diff)
• Main/PerformanceImpl.cpp (modified) (1 diff)
• Main/VMMDevInterface.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (6 diffs)
• Main/include/GuestImpl.h (modified) (3 diffs)
• Main/include/Performance.h (modified) (1 diff)

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

@@ -122 +122 @@
     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_COMPACT          = 5
+    VMINFO_FULL             = 2,    /**< both */
+    VMINFO_MACHINEREADABLE  = 3,    /**< both, and make it machine readable */
+    VMINFO_COMPACT          = 4
 } VMINFO_DETAILS;
 

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

@@ -791 +791 @@
                 CHECK_ERROR(guest, COMSETTER(MemoryBalloonSize)(uVal));
         }
-        else if (!strcmp(a->argv[1], "gueststatisticsinterval"))
-        {
-            if (a->argc != 3)
-            {
-                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
-                rc = E_FAIL;
-                break;
-            }
-            uint32_t uVal;
-            int vrc;
-            vrc = RTStrToUInt32Ex(a->argv[2], NULL, 0, &uVal);
-            if (vrc != VINF_SUCCESS)
-            {
-                errorArgument("Error parsing guest statistics interval '%s'", a->argv[2]);
-                rc = E_FAIL;
-                break;
-            }
-
-            /* guest is running; update IGuest */
-            ComPtr <IGuest> guest;
-
-            rc = console->COMGETTER(Guest)(guest.asOutParam());
-            if (SUCCEEDED(rc))
-                CHECK_ERROR(guest, COMSETTER(StatisticsUpdateInterval)(uVal));
-        }
-        /* Undocumented show guest statistics testcase. */
-        else if (!strcmp(a->argv[1], "showgueststats"))
-        {
-            /* guest is running; update IGuest */
-            ComPtr <IGuest> guest;
-
-            rc = console->COMGETTER(Guest)(guest.asOutParam());
-            if (SUCCEEDED(rc))
-            {
-                ULONG StatVal;
-
-                if (guest->GetStatistic(0, GuestStatisticType_SampleNumber, &StatVal) == S_OK)
-                    RTPrintf("Statistics sample:      %u\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_CPULoad_Idle, &StatVal) == S_OK)
-                    RTPrintf("CPU load idle:          %u%%\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_CPULoad_Kernel, &StatVal) == S_OK)
-                    RTPrintf("CPU load kernel:        %u%%\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_CPULoad_User, &StatVal) == S_OK)
-                    RTPrintf("CPU load user:          %u%%\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_Threads, &StatVal) == S_OK)
-                    RTPrintf("Nr. of threads:         %u\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_Processes, &StatVal) == S_OK)
-                    RTPrintf("Nr. of processes:       %u\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_Handles, &StatVal) == S_OK)
-                    RTPrintf("Nr. of handles:         %u\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_MemoryLoad, &StatVal) == S_OK)
-                    RTPrintf("Memory load:            %u\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_PhysMemTotal, &StatVal) == S_OK)
-                    RTPrintf("Total phys. memory:     %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_PhysMemAvailable, &StatVal) == S_OK)
-                    RTPrintf("Available phys. memory: %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_PhysMemBalloon, &StatVal) == S_OK)
-                    RTPrintf("Balloon size:           %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_MemCommitTotal, &StatVal) == S_OK)
-                    RTPrintf("Total memory commit:    %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_MemKernelTotal, &StatVal) == S_OK)
-                    RTPrintf("Kernel memory:          %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_MemKernelPaged, &StatVal) == S_OK)
-                    RTPrintf("Paged kernel mem:       %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_MemKernelNonpaged, &StatVal) == S_OK)
-                    RTPrintf("Locked kernel mem:      %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_MemSystemCache, &StatVal) == S_OK)
-                    RTPrintf("System cache:          %uMB\n", StatVal);
-                if (guest->GetStatistic(0, GuestStatisticType_PageFileSize, &StatVal) == S_OK)
-                    RTPrintf("Page file size:        %uMB\n", StatVal);
-            }
-        }
         else if (!strcmp(a->argv[1], "teleport"))
         {

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

@@ -1806 +1806 @@
             RTPrintf("Configured memory balloon size:      %d MB\n", guestVal);
     }
-    rc = machine->COMGETTER(StatisticsUpdateInterval)(&guestVal);
-    if (SUCCEEDED(rc))
-    {
-        if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("GuestStatisticsUpdateInterval=%d\n", guestVal);
-        else
-        {
-            if (guestVal == 0)
-                RTPrintf("Statistics update:                   disabled\n");
-            else
-                RTPrintf("Statistics update interval:          %d seconds\n", guestVal);
-        }
-    }
     if (details != VMINFO_MACHINEREADABLE)
         RTPrintf("\n");
-
-    if (    console
-        &&  (   details == VMINFO_STATISTICS
-             || details == VMINFO_FULL
-             || details == VMINFO_MACHINEREADABLE))
-    {
-        ComPtr <IGuest> guest;
-
-        rc = console->COMGETTER(Guest)(guest.asOutParam());
-        if (SUCCEEDED(rc))
-        {
-            ULONG statVal;
-
-            rc = guest->GetStatistic(0, GuestStatisticType_SampleNumber, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestSample=%d\n", statVal);
-                else
-                    RTPrintf("Guest statistics for sample %d:\n\n", statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_CPULoad_Idle, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestLoadIdleCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: CPU Load Idle          %-3d%%\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_CPULoad_Kernel, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestLoadKernelCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: CPU Load Kernel        %-3d%%\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_CPULoad_User, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestLoadUserCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: CPU Load User          %-3d%%\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_Threads, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestThreadsCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Threads                %d\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_Processes, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestProcessesCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Processes              %d\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_Handles, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestHandlesCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Handles                %d\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_MemoryLoad, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryLoadCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Memory Load            %d%%\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_PhysMemTotal, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryTotalPhysCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Total physical memory  %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_PhysMemAvailable, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryFreePhysCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Free physical memory   %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_PhysMemBalloon, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryBalloonCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Memory balloon size    %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_MemCommitTotal, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryCommittedCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Committed memory       %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_MemKernelTotal, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryTotalKernelCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Total kernel memory    %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_MemKernelPaged, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryPagedKernelCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Paged kernel memory    %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_MemKernelNonpaged, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestMemoryNonpagedKernelCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Nonpaged kernel memory %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_MemSystemCache, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestSystemCacheSizeCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: System cache size      %-4d MB\n", 0, statVal);
-            }
-
-            rc = guest->GetStatistic(0, GuestStatisticType_PageFileSize, &statVal);
-            if (SUCCEEDED(rc))
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("StatGuestPageFileSizeCPU%d=%d\n", 0, statVal);
-                else
-                    RTPrintf("CPU%d: Page file size         %-4d MB\n", 0, statVal);
-            }
-
-            RTPrintf("\n");
-        }
-        else
-        {
-            if (details != VMINFO_MACHINEREADABLE)
-            {
-                RTPrintf("[!] FAILED calling console->getGuest at line %d!\n", __LINE__);
-                GluePrintRCMessage(rc);
-            }
-        }
-    }
 
     /*
@@ -2029 +1839 @@
     { "--details",          'D', RTGETOPT_REQ_NOTHING },
     { "-details",           'D', RTGETOPT_REQ_NOTHING },    // deprecated
-    { "--statistics",       'S', RTGETOPT_REQ_NOTHING },
-    { "-statistics",        'S', RTGETOPT_REQ_NOTHING },    // deprecated
     { "--machinereadable",  'M', RTGETOPT_REQ_NOTHING },
     { "-machinereadable",   'M', RTGETOPT_REQ_NOTHING },    // deprecated
@@ -2040 +1848 @@
     const char *VMNameOrUuid = NULL;
     bool fDetails = false;
-    bool fStatistics = false;
     bool fMachinereadable = false;
 
@@ -2055 +1862 @@
             case 'D':   // --details
                 fDetails = true;
-                break;
-
-            case 'S':   // --statistics
-                fStatistics = true;
                 break;
 
@@ -2109 +1912 @@
         return 1;
 
-    /* 2nd option can be -details, -statistics or -argdump */
+    /* 2nd option can be -details or -argdump */
     VMINFO_DETAILS details = VMINFO_NONE;
     if (fMachinereadable)
         details = VMINFO_MACHINEREADABLE;
     else
-    if (fDetails && fStatistics)
+    if (fDetails)
         details = VMINFO_FULL;
     else
     if (fDetails)
         details = VMINFO_STANDARD;
-    else
-    if (fStatistics)
-        details = VMINFO_STATISTICS;
 
     ComPtr <IConsole> console;

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

@@ -120 +120 @@
     MODIFYVM_UARTMODE,
     MODIFYVM_UART,
-    MODIFYVM_GUESTSTATISTICSINTERVAL,
     MODIFYVM_GUESTMEMORYBALLOON,
     MODIFYVM_AUDIOCONTROLLER,
@@ -216 +215 @@
     { "--uartmode",                 MODIFYVM_UARTMODE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--uart",                     MODIFYVM_UART,                      RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
-    { "--gueststatisticsinterval",  MODIFYVM_GUESTSTATISTICSINTERVAL,   RTGETOPT_REQ_UINT32 },
     { "--guestmemoryballoon",       MODIFYVM_GUESTMEMORYBALLOON,        RTGETOPT_REQ_UINT32 },
     { "--audiocontroller",          MODIFYVM_AUDIOCONTROLLER,           RTGETOPT_REQ_STRING },
@@ -1395 +1393 @@
             }
 
-            case MODIFYVM_GUESTSTATISTICSINTERVAL:
-            {
-                CHECK_ERROR(machine, COMSETTER(StatisticsUpdateInterval)(ValueUnion.u32));
-                break;
-            }
-
             case MODIFYVM_GUESTMEMORYBALLOON:
             {

trunk/src/VBox/Main/GuestImpl.cpp

@@ -87 +87 @@
         mMemoryBalloonSize = 0;                     /* Default is no ballooning */
 
-    ULONG aStatUpdateInterval;
-    ret = mParent->machine()->COMGETTER(StatisticsUpdateInterval)(&aStatUpdateInterval);
-    if (ret == S_OK)
-        mStatUpdateInterval = aStatUpdateInterval;
-    else
-        mStatUpdateInterval = 0;                    /* Default is not to report guest statistics at all */
-
-    /* invalidate all stats */
-    for (int i=0;i<GuestStatisticType_MaxVal;i++)
-        mCurrentGuestStat[i] = GUEST_STAT_INVALID;
-
-    /* start with sample 0 */
-    mCurrentGuestStat[GuestStatisticType_SampleNumber] = 0;
+    mStatUpdateInterval = 0;                    /* Default is not to report guest statistics at all */
     return S_OK;
 }
@@ -230 +218 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(StatisticsUpdateInterval) (ULONG *aUpdateInterval)
+HRESULT Guest::GetStatisticsUpdateInterval (ULONG *aUpdateInterval)
 {
     CheckComArgOutPointerValid(aUpdateInterval);
@@ -244 +232 @@
 }
 
-STDMETHODIMP Guest::COMSETTER(StatisticsUpdateInterval) (ULONG aUpdateInterval)
+HRESULT Guest::SetStatisticsUpdateInterval (ULONG aUpdateInterval)
 {
     AutoCaller autoCaller(this);
@@ -251 +239 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT ret = mParent->machine()->COMSETTER(StatisticsUpdateInterval)(aUpdateInterval);
-    if (ret == S_OK)
-    {
-        mStatUpdateInterval = aUpdateInterval;
-        /* forward the information to the VMM device */
-        VMMDev *vmmDev = mParent->getVMMDev();
-        if (vmmDev)
-            vmmDev->getVMMDevPort()->pfnSetStatisticsInterval(vmmDev->getVMMDevPort(), aUpdateInterval);
-    }
-
-    return ret;
+    mStatUpdateInterval = aUpdateInterval;
+    /* forward the information to the VMM device */
+    VMMDev *vmmDev = mParent->getVMMDev();
+    if (vmmDev)
+        vmmDev->getVMMDevPort()->pfnSetStatisticsInterval(vmmDev->getVMMDevPort(), aUpdateInterval);
+
+    return S_OK;
 }
 
@@ -286 +270 @@
     return setError(VBOX_E_VM_ERROR,
                     tr("VMM device is not available (is the VM running?)"));
-}
-
-STDMETHODIMP Guest::GetStatistic(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG *aStatVal)
-{
-    CheckComArgExpr(aCpuId, aCpuId == 0);
-    CheckComArgExpr(aStatistic, aStatistic < GuestStatisticType_MaxVal);
-    CheckComArgOutPointerValid(aStatVal);
-
-    /* Not available or not yet reported? In that case, just return with a proper error
-     * but don't use setError(). */
-    if (mCurrentGuestStat[aStatistic] == GUEST_STAT_INVALID)
-        return E_INVALIDARG;
-
-    *aStatVal = mCurrentGuestStat[aStatistic];
-    return S_OK;
-}
-
-STDMETHODIMP Guest::SetStatistic(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG aStatVal)
-{
-    CheckComArgExpr(aCpuId, aCpuId == 0);
-    CheckComArgExpr(aStatistic, aStatistic < GuestStatisticType_MaxVal);
-
-    /* internal method assumes that the caller knows what he's doing (no boundary checks) */
-    mCurrentGuestStat[aStatistic] = aStatVal;
-    return S_OK;
 }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8901 +8901 @@
     /* Create sub metrics */
     pm::SubMetric *cpuLoadUser = new pm::SubMetric("CPU/Load/User",
-        "Percentage of processor time spent in user mode by VM process.");
+        "Percentage of processor time spent in user mode by the VM process.");
     pm::SubMetric *cpuLoadKernel = new pm::SubMetric("CPU/Load/Kernel",
-        "Percentage of processor time spent in kernel mode by VM process.");
+        "Percentage of processor time spent in kernel mode by the VM process.");
     pm::SubMetric *ramUsageUsed  = new pm::SubMetric("RAM/Usage/Used",
         "Size of resident portion of VM process in memory.");
@@ -8936 +8936 @@
     aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
                                               new pm::AggregateMax()));
+
+
+    /* Guest metrics */
+
+    /* Create sub metrics */
+    pm::SubMetric *guestLoadUser = new pm::SubMetric("Guest/Cpu/Load/User",
+        "Percentage of processor time spent in user mode as seen by the guest.");
+    pm::SubMetric *guestLoadKernel = new pm::SubMetric("Guest/Cpu/Load/Kernel",
+        "Percentage of processor time spent in kernel mode as seen by the guest.");
+    pm::SubMetric *guestLoadIdle = new pm::SubMetric("Guest/Cpu/Load/Idle",
+        "Percentage of processor time spent idling as seen by the guest.");
+
+    /* The total amount of physical ram is fixed now, but we'll support dynamic guest ram configurations in the future. */
+    pm::SubMetric *guestMemTotal = new pm::SubMetric("Guest/RAM/Usage/Total",      "Total amount of physical guest RAM.");
+    pm::SubMetric *guestMemFree = new pm::SubMetric("Guest/RAM/Usage/Free",        "Free amount of physical guest RAM.");
+    pm::SubMetric *guestMemBalloon = new pm::SubMetric("Guest/RAM/Usage/Balloon",  "Amount of ballooned physical guest RAM.");
+    pm::SubMetric *guestMemCache = new pm::SubMetric("Guest/RAM/Usage/Cache",        "Total amount of guest (disk) cache memory.");
+
+    pm::SubMetric *guestPagedTotal = new pm::SubMetric("Guest/Pagefile/Usage/Total",    "Total amount of space in the page file.");
+    pm::SubMetric *guestPagedFree = new pm::SubMetric("Guest/Pagefile/Usage/Free",      "Total amount of free space in the page file.");
+
+    pm::SubMetric *guestSystemProc = new pm::SubMetric("Guest/System/Processes",      "Total number of guest processes.");
+    pm::SubMetric *guestSystemThread = new pm::SubMetric("Guest/System/Threads",      "Total number of guest threads.");
+
+    /* Create and register base metrics */
+    pm::BaseMetric *guestCpuLoad = new pm::GuestCpuLoad(hal, aMachine, guestLoadUser, guestLoadKernel, guestLoadIdle);
+    aCollector->registerBaseMetric(guestCpuLoad);
+
+    pm::BaseMetric *guestCpuMem = new pm::GuestRamUsage(hal, aMachine, guestMemTotal, guestMemFree, guestMemBalloon, 
+                                                        guestMemCache, guestPagedTotal, guestPagedFree);
+    aCollector->registerBaseMetric(guestCpuMem);
+
+    pm::BaseMetric *guestSystem = new pm::GuestSystemUsage(hal, aMachine, guestSystemProc, guestSystemThread);
+    aCollector->registerBaseMetric(guestSystem);
+
+
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadUser, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadUser, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadUser, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadUser, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadKernel, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadKernel, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadKernel, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadKernel, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadIdle, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadIdle, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadIdle, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuLoad, guestLoadIdle, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemTotal, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemTotal, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemTotal, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemTotal, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemFree, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemFree, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemFree, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemFree, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemBalloon, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemBalloon, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemBalloon, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemBalloon, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemCache, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemCache, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemCache, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestMemCache, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, 0));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemProc, 0));
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemProc, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemProc, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemProc, new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemThread, 0));
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemThread, new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemThread, new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(guestSystem, guestSystemThread, new pm::AggregateMax()));
 };
 

trunk/src/VBox/Main/Performance.cpp

@@ -293 +293 @@
 }
 
+
+void GuestCpuLoad::init(ULONG period, ULONG length)
+{
+    mPeriod = period;
+    mLength = length;
+
+    mUser->init(mLength);
+    mKernel->init(mLength);
+    mIdle->init(mLength);
+}
+
+void GuestCpuLoad::preCollect(CollectorHints& hints)
+{
+}
+
+void GuestCpuLoad::collect()
+{
+#if 0
+    uint64_t processUser, processKernel, hostTotal;
+
+    int rc = mHAL->getRawProcessCpuLoad(mProcess, &processUser, &processKernel, &hostTotal);
+    if (RT_SUCCESS(rc))
+    {
+        if (hostTotal == mHostTotalPrev)
+        {
+            /* Nearly impossible, but... */
+            mUser->put(0);
+            mKernel->put(0);
+        }
+        else
+        {
+            mUser->put((ULONG)(PM_CPU_LOAD_MULTIPLIER * (processUser - mProcessUserPrev) / (hostTotal - mHostTotalPrev)));
+            mKernel->put((ULONG)(PM_CPU_LOAD_MULTIPLIER * (processKernel - mProcessKernelPrev ) / (hostTotal - mHostTotalPrev)));
+        }
+
+        mHostTotalPrev     = hostTotal;
+        mProcessUserPrev   = processUser;
+        mProcessKernelPrev = processKernel;
+    }
+#endif
+}
+
+void GuestRamUsage::init(ULONG period, ULONG length)
+{
+    mPeriod = period;
+    mLength = length;
+
+    mTotal->init(mLength);
+    mFree->init(mLength);
+    mBallooned->init(mLength);
+    mCache->init(mLength);
+    mPagedTotal->init(mLength);
+    mPagedFree->init(mLength);
+}
+
+void GuestRamUsage::preCollect(CollectorHints& hints)
+{
+}
+
+void GuestRamUsage::collect()
+{
+#if 0
+    ULONG used;
+    int rc = mHAL->getProcessMemoryUsage(mProcess, &used);
+    if (RT_SUCCESS(rc))
+        mUsed->put(used);
+#endif
+}
+
+void GuestSystemUsage::init(ULONG period, ULONG length)
+{
+    mPeriod = period;
+    mLength = length;
+
+    mThreads->init(mLength);
+    mProcesses->init(mLength);
+}
+
+void GuestSystemUsage::preCollect(CollectorHints& hints)
+{
+}
+
+void GuestSystemUsage::collect()
+{
+#if 0
+    ULONG used;
+    int rc = mHAL->getProcessMemoryUsage(mProcess, &used);
+    if (RT_SUCCESS(rc))
+        mUsed->put(used);
+#endif
+}
+
+
 void CircularBuffer::init(ULONG ulLength)
 {

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -68 +68 @@
     "RAM/Usage/Free:min",
     "RAM/Usage/Free:max",
+    "Guest/RAM/Usage/Total",
+    "Guest/RAM/Usage/Total:avg",
+    "Guest/RAM/Usage/Total:min",
+    "Guest/RAM/Usage/Total:max",
+    "Guest/RAM/Usage/Free",
+    "Guest/RAM/Usage/Free:avg",
+    "Guest/RAM/Usage/Free:min",
+    "Guest/RAM/Usage/Free:max",
+    "Guest/RAM/Usage/Balloon",
+    "Guest/RAM/Usage/Balloon:avg",
+    "Guest/RAM/Usage/Balloon:min",
+    "Guest/RAM/Usage/Balloon:max",
+    "Guest/RAM/Usage/Cache",
+    "Guest/RAM/Usage/Cache:avg",
+    "Guest/RAM/Usage/Cache:min",
+    "Guest/RAM/Usage/Cache:max",
+    "Guest/Pagefile/Usage/Total",
+    "Guest/Pagefile/Usage/Total:avg",
+    "Guest/Pagefile/Usage/Total:min",
+    "Guest/Pagefile/Usage/Total:max",
+    "Guest/Pagefile/Usage/Free",
+    "Guest/Pagefile/Usage/Free:avg",
+    "Guest/Pagefile/Usage/Free:min",
+    "Guest/Pagefile/Usage/Free:max",
+    "Guest/System/Processes",
+    "Guest/System/Processes:avg",
+    "Guest/System/Processes:min",
+    "Guest/System/Processes:max",
+    "Guest/System/Threads",
+    "Guest/System/Threads:avg",
+    "Guest/System/Threads:min",
+    "Guest/System/Threads:max",
 };
 

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -431 +431 @@
         return VERR_INVALID_PARAMETER; /** @todo wrong error */
 
-    guest->COMGETTER(StatisticsUpdateInterval)(&val);
+    guest->GetStatisticsUpdateInterval(&val);
     *pulInterval = val;
     return VINF_SUCCESS;
@@ -458 +458 @@
         return VERR_INVALID_PARAMETER; /** @todo wrong error */
 
+#if 0
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_IDLE)
         guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_CPULoad_Idle, pGuestStats->u32CpuLoad_Idle);
@@ -517 +518 @@
     if (SUCCEEDED(rc))
         guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_SampleNumber, sample+1);
-
+#endif
     return VINF_SUCCESS;
 }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -982 +982 @@
     <const name="Machine"         value="1"/>
     <const name="Session"         value="2"/>
-  </enum>
-
-  <enum
-    name="GuestStatisticType"
-    uuid="aa7c1d71-aafe-47a8-9608-27d2d337cf55"
-  >
-    <desc>
-      Statistics type for <link to="IGuest::getStatistic"/>.
-    </desc>
-
-    <const name="CPULoad_Idle"         value="0">
-      <desc>
-        Idle CPU load (0-100%) for last interval.
-      </desc>
-    </const>
-    <const name="CPULoad_Kernel"       value="1">
-      <desc>
-        Kernel CPU load (0-100%) for last interval.
-      </desc>
-    </const>
-    <const name="CPULoad_User"         value="2">
-      <desc>
-        User CPU load (0-100%) for last interval.
-      </desc>
-    </const>
-    <const name="Threads"              value="3">
-      <desc>
-        Total number of threads in the system.
-      </desc>
-    </const>
-    <const name="Processes"            value="4">
-      <desc>
-        Total number of processes in the system.
-      </desc>
-    </const>
-    <const name="Handles"              value="5">
-      <desc>
-        Total number of handles in the system.
-      </desc>
-    </const>
-    <const name="MemoryLoad"           value="6">
-      <desc>
-        Memory load (0-100%).
-      </desc>
-    </const>
-    <const name="PhysMemTotal"         value="7">
-      <desc>
-        Total physical memory in megabytes.
-      </desc>
-    </const>
-    <const name="PhysMemAvailable"     value="8">
-      <desc>
-        Free physical memory in megabytes.
-      </desc>
-    </const>
-    <const name="PhysMemBalloon"       value="9">
-      <desc>
-        Ballooned physical memory in megabytes.
-      </desc>
-    </const>
-    <const name="MemCommitTotal"       value="10">
-      <desc>
-        Total amount of memory in the committed state in megabytes.
-      </desc>
-    </const>
-    <const name="MemKernelTotal"       value="11">
-      <desc>
-        Total amount of memory used by the guest OS's kernel in megabytes.
-      </desc>
-    </const>
-    <const name="MemKernelPaged"       value="12">
-      <desc>
-        Total amount of paged memory used by the guest OS's kernel in megabytes.
-      </desc>
-    </const>
-    <const name="MemKernelNonpaged"    value="13">
-      <desc>
-        Total amount of non-paged memory used by the guest OS's kernel in megabytes.
-      </desc>
-    </const>
-    <const name="MemSystemCache"       value="14">
-      <desc>
-        Total amount of memory used by the guest OS's system cache in megabytes.
-      </desc>
-    </const>
-    <const name="PageFileSize"         value="15">
-      <desc>
-        Pagefile size in megabytes.
-      </desc>
-    </const>
-    <const name="SampleNumber"         value="16">
-      <desc>
-        Statistics sample number
-      </desc>
-    </const>
-    <const name="MaxVal"               value="17"/>
   </enum>
 
@@ -4240 +4144 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="07862b34-c068-4667-be7d-1d722f496f20"
+     uuid="21f56f5d-d0fc-49e5-9ea7-91639278f424"
      wsmap="managed"
      >
@@ -4445 +4349 @@
     </attribute>
 
-    <attribute name="statisticsUpdateInterval" type="unsigned long">
-      <desc>Initial interval to update guest statistics in seconds.</desc>
-    </attribute>
-
     <attribute name="VRAMSize" type="unsigned long">
       <desc>Video memory size in megabytes.</desc>
@@ -8453 +8353 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="a910034a-f95e-bc2c-6bae-eabc3ccd9c73"
+     uuid="2f6fba62-0d41-42fd-a891-51b7d87a9e84"
      wsmap="managed"
      >
@@ -8518 +8418 @@
     </attribute>
 
-    <attribute name="statisticsUpdateInterval" type="unsigned long">
-      <desc>Interval to update guest statistics in seconds.</desc>
-    </attribute>
-
     <method name="setCredentials">
       <desc>
@@ -8550 +8446 @@
           not be supported by all versions of the Additions.
         </desc>
-      </param>
-    </method>
-
-    <method name="getStatistic">
-      <desc>
-        Query specified guest statistics as reported by the VirtualBox Additions.
-      </desc>
-      <param name="cpuId" type="unsigned long" dir="in">
-        <desc>Virtual CPU id; not relevant for all statistic types</desc>
-      </param>
-      <param name="statistic" type="GuestStatisticType" dir="in">
-        <desc>Statistic type.</desc>
-      </param>
-      <param name="statVal" type="unsigned long" dir="return">
-        <desc>Statistics value</desc>
       </param>
     </method>

trunk/src/VBox/Main/include/GuestImpl.h

@@ -65 +65 @@
     STDMETHOD(COMGETTER(MemoryBalloonSize)) (ULONG *aMemoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize)) (ULONG aMemoryBalloonSize);
-    STDMETHOD(COMGETTER(StatisticsUpdateInterval)) (ULONG *aUpdateInterval);
-    STDMETHOD(COMSETTER(StatisticsUpdateInterval)) (ULONG aUpdateInterval);
 
     // IGuest methods
     STDMETHOD(SetCredentials)(IN_BSTR aUserName, IN_BSTR aPassword,
                               IN_BSTR aDomain, BOOL aAllowInteractiveLogon);
-    STDMETHOD(GetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG *aStatVal);
     STDMETHOD(ExecuteProgram)(IN_BSTR aCommand, ULONG aFlags,
                               IN_BSTR aArguments, ComSafeArrayIn(IN_BSTR, aEnvironment),
@@ -85 +82 @@
     void setSupportsGraphics (BOOL aSupportsGraphics);
 
-    STDMETHOD(SetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG aStatVal);
+    HRESULT GetStatisticsUpdateInterval(ULONG *aUpdateInterval);
+    HRESULT SetStatisticsUpdateInterval(ULONG aUpdateInterval);
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -115 +113 @@
     ULONG mStatUpdateInterval;
 
-    ULONG mCurrentGuestStat[GuestStatisticType_MaxVal];
-
     Console *mParent;
     Data mData;

trunk/src/VBox/Main/include/Performance.h

@@ -318 +318 @@
     };
 
+
+    class GuestCpuLoad : public BaseMetric
+    {
+    public:
+        GuestCpuLoad(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *user, SubMetric *kernel, SubMetric *idle)
+        : BaseMetric(hal, "CPU/Load", object), mUser(user), mKernel(kernel), mIdle(idle) {};
+        ~GuestCpuLoad() { delete mUser; delete mKernel; delete mIdle; };
+
+        void init(ULONG period, ULONG length);
+        void preCollect(CollectorHints& hints);
+        void collect();
+        const char *getUnit() { return "%"; };
+        ULONG getMinValue() { return 0; };
+        ULONG getMaxValue() { return PM_CPU_LOAD_MULTIPLIER; };
+        ULONG getScale() { return PM_CPU_LOAD_MULTIPLIER / 100; }
+    protected:
+        SubMetric *mUser;
+        SubMetric *mKernel;
+        SubMetric *mIdle;
+    };
+
+    class GuestRamUsage : public BaseMetric
+    {
+    public:
+        GuestRamUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *free, SubMetric *balloon, SubMetric *cache, SubMetric *pagedtotal, SubMetric *pagedfree)
+        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mFree(free), mBallooned(balloon), mCache(cache), mPagedTotal(pagedtotal), mPagedFree(pagedfree) {};
+        ~GuestRamUsage() { delete mTotal; delete mFree; delete mBallooned; delete mCache; delete mPagedTotal; delete mPagedFree; };
+
+        void init(ULONG period, ULONG length);
+        void preCollect(CollectorHints& hints);
+        void collect();
+        const char *getUnit() { return "kB"; };
+        ULONG getMinValue() { return 0; };
+        ULONG getMaxValue() { return INT32_MAX; };
+        ULONG getScale() { return 1; }
+    private:
+        SubMetric *mTotal, *mFree, *mBallooned, *mCache, *mPagedTotal, *mPagedFree;
+    };
+
+    class GuestSystemUsage : public BaseMetric
+    {
+    public:
+        GuestSystemUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *processes, SubMetric *threads)
+        : BaseMetric(hal, "System/Usage", object), mProcesses(processes), mThreads(threads) {};
+        ~GuestSystemUsage() { delete mProcesses; delete mThreads; };
+
+        void init(ULONG period, ULONG length);
+        void preCollect(CollectorHints& hints);
+        void collect();
+        const char *getUnit() { return "kB"; };
+        ULONG getMinValue() { return 0; };
+        ULONG getMaxValue() { return INT32_MAX; };
+        ULONG getScale() { return 1; }
+    private:
+        SubMetric *mProcesses, *mThreads;
+    };
+
     /* Aggregate Functions **************************************************/
     class Aggregate