Changeset 28004 in vbox

Timestamp:

Apr 6, 2010 1:23:44 PM (15 years ago)

Author:

vboxsync

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

59711

Message:

Metrics updates

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (3 diffs)
• HostImpl.cpp (modified) (3 diffs)
• Performance.cpp (modified) (1 diff)
• PerformanceImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (4 diffs)
• include/GuestImpl.h (modified) (1 diff)
• include/Performance.h (modified) (3 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -38 +38 @@
 #include <iprt/cpp/utils.h>
 #include <iprt/getopt.h>
+#include <VBox/pgm.h>
 
 // defines
@@ -252 +253 @@
 }
 
-STDMETHODIMP Guest::InternalGetStatistics(ULONG aCpuId, ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
-                                          ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
-                                          ULONG *aPageTotal)
+STDMETHODIMP Guest::InternalGetStatistics(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
+                                          ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemBalloonTotal,
+                                          ULONG *aMemCache, ULONG *aPageTotal)
 {
     CheckComArgOutPointerValid(aCpuUser);
@@ -275 +276 @@
     *aMemTotal = mCurrentGuestStat[GUESTSTATTYPE_MEMTOTAL];
     *aMemFree = mCurrentGuestStat[GUESTSTATTYPE_MEMFREE];
-    *aMemBalloon = mCurrentGuestStat[GUESTSTATTYPE_MEMBALLOON];
+
     *aMemCache = mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE];
     *aPageTotal = mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL];
+
+    Console::SafeVMPtr pVM (mParent);
+    if (pVM.isOk())
+    {
+        unsigned uBalloon, uBalloonTotal;
+        *aMemBalloon      = 0;
+        *aMemBalloonTotal = 0;
+        int rc = PGMR3QueryBalloonSize(pVM.raw(), &uBalloon, &uBalloonTotal);
+        AssertRC(rc);
+        if (rc == VINF_SUCCESS)
+        {
+            *aMemBalloon      = uBalloon;
+            *aMemBalloonTotal = uBalloonTotal;
+        }
+    }
+    else
+    {
+        *aMemBalloon      = 0;
+        *aMemBalloonTotal = 0;
+    }
 
     return S_OK;

trunk/src/VBox/Main/HostImpl.cpp

@@ -2411 +2411 @@
     pm::SubMetric *ramUsageFree  = new pm::SubMetric("RAM/Usage/Free",
         "Physical memory currently available to applications.");
+    pm::SubMetric *ramUsageBalloon = new pm::SubMetric("RAM/Usage/Ballooned",
+        "Physical memory currently available from guest balloons.");
     /* Create and register base metrics */
     IUnknown *objptr;
@@ -2421 +2423 @@
     aCollector->registerBaseMetric (cpuMhz);
     pm::BaseMetric *ramUsage = new pm::HostRamUsage(hal, objptr, ramUsageTotal, ramUsageUsed,
-                                           ramUsageFree);
+                                           ramUsageFree, ramUsageBalloon);
     aCollector->registerBaseMetric (ramUsage);
 
@@ -2479 +2481 @@
     aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree,
                                               new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon,
+                                              new pm::AggregateMax()));
 };
 

trunk/src/VBox/Main/Performance.cpp

@@ -168 +168 @@
         &&  iTick != mLastTick)
     {
-        mGuest->InternalGetStatistics(0, &mCpuUser, &mCpuKernel, &mCpuIdle,
-                                      &mMemTotal, &mMemFree, &mMemBalloon, &mMemCache,
+        ULONG ulMemBalloonTotal;
+
+        mGuest->InternalGetStatistics(&mCpuUser, &mCpuKernel, &mCpuIdle,
+                                      &mMemTotal, &mMemFree, &mMemBalloon, &ulMemBalloonTotal, &mMemCache,
                                       &mPageTotal);
         mLastTick = iTick;

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -68 +68 @@
     "RAM/Usage/Free:min",
     "RAM/Usage/Free:max",
+    "RAM/Usage/Ballooned",
+    "RAM/Usage/Ballooned:avg",
+    "RAM/Usage/Ballooned:min",
+    "RAM/Usage/Ballooned:max",
     "Guest/CPU/Load/User",
     "Guest/CPU/Load/User:avg",

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

@@ -8271 +8271 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="8cec1502-8869-42e3-9d9c-45f0d1bb0861"
+    uuid="3fcf2078-3c69-45ca-bd5c-79c3e3c15362"
     wsmap="struct"
   >
@@ -8353 +8353 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="a2c749bb-55df-46a4-8d88-567ee1503fff"
+     uuid="8e809ebd-c842-4952-8073-c9c07045c9a2"
      wsmap="managed"
      >
@@ -8426 +8426 @@
          Internal method; do not use as it might change at any time
       </desc> 
-      <param name="cpuId" type="unsigned long" dir="in"> 
-         <desc>Virtual CPU id</desc> 
-      </param> 
       <param name="cpuUser" type="unsigned long" dir="out"> 
          <desc>Percentage of processor time spent in user mode as seen by the guest</desc> 
@@ -8446 +8443 @@
       <param name="memBalloon" type="unsigned long" dir="out"> 
          <desc>Amount of ballooned physical guest RAM</desc> 
+      </param> 
+      <param name="memBalloonTotal" type="unsigned long" dir="out"> 
+         <desc>Amount of ballooned physical guest RAM for all running VMs</desc> 
       </param> 
       <param name="memCache" type="unsigned long" dir="out"> 

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

@@ -88 +88 @@
                               IN_BSTR aUserName, IN_BSTR aPassword,
                               ULONG aTimeoutMS, ULONG* aPID, IProgress **aProgress);
-    STDMETHOD(InternalGetStatistics)(ULONG aCpuId, ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
-                                     ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
+    STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
+                                     ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemBalloonTotal, ULONG *aMemCache,
                                      ULONG *aPageTotal);
 

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

@@ -189 +189 @@
         void getGuestMemLoad(ULONG *pulMemTotal, ULONG *pulMemFree, ULONG *pulMemBalloon, ULONG *pulMemCache, ULONG *pulPageTotal)
         {
-            *pulMemTotal   = mMemTotal;
-            *pulMemFree    = mMemFree;
-            *pulMemBalloon = mMemBalloon;
-            *pulMemCache   = mMemCache;
-            *pulPageTotal  = mPageTotal;
+            *pulMemTotal        = mMemTotal;
+            *pulMemFree         = mMemFree;
+            *pulMemBalloon      = mMemBalloon;
+            *pulMemCache        = mMemCache;
+            *pulPageTotal       = mPageTotal;
         }
 
@@ -318 +318 @@
     {
     public:
-        HostRamUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *used, SubMetric *available)
-        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mUsed(used), mAvailable(available) {};
-        ~HostRamUsage() { delete mTotal; delete mUsed; delete mAvailable; };
+        HostRamUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *used, SubMetric *available, SubMetric *ballooned)
+        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mUsed(used), mAvailable(available), mBallooned(ballooned) {};
+        ~HostRamUsage() { delete mTotal; delete mUsed; delete mAvailable; delete mBallooned; };
 
         void init(ULONG period, ULONG length);
@@ -333 +333 @@
         SubMetric *mUsed;
         SubMetric *mAvailable;
+        SubMetric *mBallooned;
     };