Changeset 28036 in vbox for trunk/src/VBox/Main/Performance.cpp

Timestamp:

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

Author:

vboxsync

Message:

More metrics changes

File:

• trunk/src/VBox/Main/Performance.cpp (modified) (3 diffs)

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));
 }