Changeset 28036 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 7, 2010 9:47:43 AM (15 years ago)

Author:

vboxsync

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

59743

Message:

More metrics changes

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -255 +255 @@
 STDMETHODIMP Guest::InternalGetStatistics(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
                                           ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, 
-                                          ULONG *aMemCache, ULONG *aPageTotal, ULONG *aMemFreeTotal)
+                                          ULONG *aMemCache, ULONG *aPageTotal, 
+                                          ULONG *aMemAllocTotal, ULONG *aMemFreeTotal, ULONG *aMemBalloonTotal)
 {
     CheckComArgOutPointerValid(aCpuUser);
@@ -283 +284 @@
     if (pVM.isOk())
     {
-        unsigned uFreeTotal;
+        uint64_t uFreeTotal, uAllocTotal, uBalloonedTotal;
         *aMemFreeTotal = 0;
-        int rc = PGMR3QueryFreeMemory(pVM.raw(), &uFreeTotal);
+        int rc = PGMR3QueryVMMMemoryStats(pVM.raw(), &uAllocTotal, &uFreeTotal, &uBalloonedTotal);
         AssertRC(rc);
         if (rc == VINF_SUCCESS)
-            *aMemFreeTotal = uFreeTotal;
+        {
+            *aMemAllocTotal   = uAllocTotal / _1K;  /* bytes -> KB */
+            *aMemFreeTotal    = uFreeTotal / _1K;
+            *aMemBalloonTotal = uBalloonedTotal / _1K;
+        }
     }
     else

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 *ramVMMUsed = new pm::SubMetric("RAM/VMM/Used",
+        "Total physical memory used by the hypervisor.");
+    pm::SubMetric *ramVMMFree = new pm::SubMetric("RAM/VMM/Free",
+        "Total physical memory free inside the hypervisor.");
+    pm::SubMetric *ramVMMBallooned  = new pm::SubMetric("RAM/VMM/Ballooned",
+        "Total physical memory ballooned by the hypervisor.");
+
 
     /* Create and register base metrics */
@@ -2422 +2429 @@
     aCollector->registerBaseMetric (cpuMhz);
     pm::BaseMetric *ramUsage = new pm::HostRamUsage(hal, objptr, ramUsageTotal, ramUsageUsed,
-                                           ramUsageFree);
+                                           ramUsageFree, ramVMMUsed, ramVMMFree, ramVMMBallooned);
     aCollector->registerBaseMetric (ramUsage);
 
@@ -2480 +2487 @@
     aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree,
                                               new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMUsed, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMUsed,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMUsed,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMUsed,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMFree, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMFree,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMFree,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMFree,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMBallooned, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMBallooned,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMBallooned,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramVMMBallooned,
+                                              new pm::AggregateMax()));
 };
 

trunk/src/VBox/Main/Performance.cpp

@@ -168 +168 @@
         &&  iTick != mLastTick)
     {
-        ULONG ulMemFreeTotal;
+        ULONG ulMemAllocTotal, ulMemFreeTotal, ulMemBalloonTotal;
 
         mGuest->InternalGetStatistics(&mCpuUser, &mCpuKernel, &mCpuIdle,
                                       &mMemTotal, &mMemFree, &mMemBalloon, &mMemCache,
-                                      &mPageTotal, &ulMemFreeTotal);
+                                      &mPageTotal, &ulMemAllocTotal, &ulMemFreeTotal, &ulMemBalloonTotal);
 
         if (mHostHAL)
-            mHostHAL->setMemFreeTotal(ulMemFreeTotal);
+            mHostHAL->setMemHypervisorStats(ulMemAllocTotal, ulMemFreeTotal, ulMemBalloonTotal);
 
         mLastTick = iTick;
@@ -303 +303 @@
         mTotal->put(total);
         mUsed->put(used);
-        mAvailable->put(available + mHAL->getMemFreeTotal());
-    }
+        mAvailable->put(available);
+
+    }
+    ULONG allocVMM, freeVMM, balloonVMM;
+
+    mHAL->getMemHypervisorStats(&allocVMM, &freeVMM, &balloonVMM);
+    mAllocVMM->put(allocVMM);
+    mFreeVMM->put(freeVMM);
+    mBalloonVMM->put(balloonVMM);
 }
 
@@ -426 +433 @@
 
     mGuestHAL->getGuestMemLoad(&ulMemTotal, &ulMemFree, &ulMemBalloon, &ulMemCache, &ulPageTotal);
-    mTotal->put(ulMemTotal);
-    mFree->put(ulMemFree);
-    mBallooned->put(ulMemBalloon);
-    mCache->put(ulMemCache);
-    mPagedTotal->put(ulPageTotal);
+    mTotal->put(ulMemTotal * (_1M / _1K));      /* MB -> KB */
+    mFree->put(ulMemFree * (_1M / _1K));
+    mBallooned->put(ulMemBalloon * (_1M / _1K));
+    mCache->put(ulMemCache * (_1M / _1K));
+    mPagedTotal->put(ulPageTotal * (_1M / _1K));
 }
 

trunk/src/VBox/Main/PerformanceImpl.cpp

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

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

@@ -8353 +8353 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="54ebdc27-89ca-4bf8-a58a-48077679a3af"
+     uuid="8cf03bf9-7478-42de-add8-10b2af75a06d"
      wsmap="managed"
      >
@@ -8450 +8450 @@
          <desc>Total amount of space in the page file</desc> 
       </param> 
+      <param name="memAllocTotal" type="unsigned long" dir="out"> 
+         <desc>Total amount of memory allocated by the hypervisor</desc> 
+      </param> 
       <param name="memFreeTotal" type="unsigned long" dir="out"> 
-         <desc>Total amount of free memory available in VMMR0</desc> 
+         <desc>Total amount of free memory available in the hypervisor</desc> 
+      </param> 
+      <param name="memBalloonTotal" type="unsigned long" dir="out"> 
+         <desc>Total amount of memory ballooned by the hypervisor</desc> 
       </param> 
     </method> 

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

@@ -90 +90 @@
     STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
-                                     ULONG *aPageTotal, ULONG *aMemFreeTotal);
+                                     ULONG *aPageTotal, ULONG *aMemAllocTotal, ULONG *aMemFreeTotal, ULONG *aMemBalloonTotal);
 
     // public methods that are not in IDL

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

@@ -139 +139 @@
     {
     public:
-                 CollectorHAL() : mMemFreeTotal(0) {};
+                 CollectorHAL() : mMemAllocVMM(0), mMemFreeVMM(0), mMemBalloonedVMM(0) {};
         virtual ~CollectorHAL() { };
         virtual int preCollect(const CollectorHints& /* hints */, uint64_t /* iTick */) { return VINF_SUCCESS; }
@@ -163 +163 @@
         virtual int disable();
 
-        virtual int setMemFreeTotal(ULONG memfree)
-        {
-            mMemFreeTotal = memfree;
+        virtual int setMemHypervisorStats(ULONG memAlloc, ULONG memFree, ULONG memBallooned)
+        {
+            mMemAllocVMM     = memAlloc;
+            mMemFreeVMM      = memFree;
+            mMemBalloonedVMM = memBallooned;
             return S_OK;
         }
 
-        virtual ULONG getMemFreeTotal()
-        {
-            return mMemFreeTotal;
-        }
-
-    private:
-        ULONG       mMemFreeTotal;
+        virtual void getMemHypervisorStats(ULONG *pMemAlloc, ULONG *pMemFree, ULONG *pMemBallooned)
+        {
+            *pMemAlloc     = mMemAllocVMM;
+            *pMemFree      = mMemFreeVMM;
+            *pMemBallooned = mMemBalloonedVMM;
+        }
+
+    private:
+        ULONG       mMemAllocVMM;
+        ULONG       mMemFreeVMM;
+        ULONG       mMemBalloonedVMM;
     };
 
@@ -201 +207 @@
         }
 
-        /** Return guest memory information in kb. */
+        /** Return guest memory information in MB. */
         void getGuestMemLoad(ULONG *pulMemTotal, ULONG *pulMemFree, ULONG *pulMemBalloon, ULONG *pulMemCache, ULONG *pulPageTotal)
         {
@@ -335 +341 @@
     {
     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 *allocVMM, SubMetric *freeVMM, SubMetric *balloonVMM)
+        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mUsed(used), mAvailable(available), mAllocVMM(allocVMM), mFreeVMM(freeVMM), mBalloonVMM(balloonVMM) {};
+        ~HostRamUsage() { delete mTotal; delete mUsed; delete mAvailable; delete mAllocVMM; delete mFreeVMM; delete mBalloonVMM; };
 
         void init(ULONG period, ULONG length);
@@ -350 +356 @@
         SubMetric *mUsed;
         SubMetric *mAvailable;
+        SubMetric *mAllocVMM; 
+        SubMetric *mFreeVMM; 
+        SubMetric *mBalloonVMM;
     };