Changeset 28038 in vbox for trunk

Timestamp:

Apr 7, 2010 10:09:36 AM (15 years ago)

Author:

vboxsync

Message:

Wrong units

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (1 diff)
• Performance.cpp (modified) (1 diff)
• include/Performance.h (modified) (1 diff)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -272 +272 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aCpuUser = mCurrentGuestStat[GUESTSTATTYPE_CPUUSER];
-    *aCpuKernel = mCurrentGuestStat[GUESTSTATTYPE_CPUKERNEL];
-    *aCpuIdle = mCurrentGuestStat[GUESTSTATTYPE_CPUIDLE];
-    *aMemTotal = mCurrentGuestStat[GUESTSTATTYPE_MEMTOTAL];
-    *aMemFree = mCurrentGuestStat[GUESTSTATTYPE_MEMFREE];
-    *aMemBalloon = mCurrentGuestStat[GUESTSTATTYPE_MEMBALLOON];
-    *aMemCache = mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE];
-    *aPageTotal = mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL];
+    *aCpuUser = mCurrentGuestStat[GUESTSTATTYPE_CPUUSER] / (_4K/_1K);   /* page (4K) -> 1 KB units */
+    *aCpuKernel = mCurrentGuestStat[GUESTSTATTYPE_CPUKERNEL] / (_4K/_1K);
+    *aCpuIdle = mCurrentGuestStat[GUESTSTATTYPE_CPUIDLE] / (_4K/_1K);
+    *aMemTotal = mCurrentGuestStat[GUESTSTATTYPE_MEMTOTAL] / (_4K/_1K);
+    *aMemFree = mCurrentGuestStat[GUESTSTATTYPE_MEMFREE] / (_4K/_1K);
+    *aMemBalloon = mCurrentGuestStat[GUESTSTATTYPE_MEMBALLOON] / (_4K/_1K);
+    *aMemCache = mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE] / (_4K/_1K);
+    *aPageTotal = mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL] / (_4K/_1K);
 
     Console::SafeVMPtr pVM (mParent);

trunk/src/VBox/Main/Performance.cpp

@@ -433 +433 @@
 
     mGuestHAL->getGuestMemLoad(&ulMemTotal, &ulMemFree, &ulMemBalloon, &ulMemCache, &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));
+    mTotal->put(ulMemTotal);
+    mFree->put(ulMemFree);
+    mBallooned->put(ulMemBalloon);
+    mCache->put(ulMemCache);
+    mPagedTotal->put(ulPageTotal);
 }
 

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

@@ -207 +207 @@
         }
 
-        /** Return guest memory information in MB. */
+        /** Return guest memory information in KB. */
         void getGuestMemLoad(ULONG *pulMemTotal, ULONG *pulMemFree, ULONG *pulMemBalloon, ULONG *pulMemCache, ULONG *pulPageTotal)
         {