Changeset 28005 in vbox

Timestamp:

Apr 6, 2010 1:52:45 PM (15 years ago)

Author:

vboxsync

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

59712

Message:

Metrics updates

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• Performance.cpp (modified) (2 diffs)
• include/Performance.h (modified) (4 diffs)
• win/PerformanceWin.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8945 +8945 @@
 
     /* Guest metrics */
-    mGuestHAL = new pm::CollectorGuestHAL(this);
+    mGuestHAL = new pm::CollectorGuestHAL(this, hal);
 
     /* Create sub metrics */

trunk/src/VBox/Main/Performance.cpp

@@ -173 +173 @@
                                       &mMemTotal, &mMemFree, &mMemBalloon, &ulMemBalloonTotal, &mMemCache,
                                       &mPageTotal);
+
+        if (mHostHAL)
+            mHostHAL->setBalloonSize(ulMemBalloonTotal);
+
         mLastTick = iTick;
     }
@@ -301 +305 @@
         mAvailable->put(available);
     }
+    mBallooned->put(mHAL->getBalloonSize());
 }
 

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

@@ -139 +139 @@
     {
     public:
+                 CollectorHAL() : mMemBalloonTotal(0) {};
         virtual ~CollectorHAL() { };
         virtual int preCollect(const CollectorHints& /* hints */, uint64_t /* iTick */) { return VINF_SUCCESS; }
@@ -161 +162 @@
         /** Disable metrics collecting (if applicable) */
         virtual int disable();
+
+        virtual int setBalloonSize(ULONG balloonsize)
+        {
+            mMemBalloonTotal = balloonsize;
+            return S_OK;
+        }
+
+        virtual ULONG getBalloonSize()
+        {
+            return mMemBalloonTotal;
+        }
+
+    private:
+        ULONG       mMemBalloonTotal;
     };
 
@@ -166 +181 @@
     {
     public:
-        CollectorGuestHAL(Machine *machine) : cEnabled(0), mMachine(machine), mConsole(NULL), mGuest(NULL), mLastTick(0),
+        CollectorGuestHAL(Machine *machine, CollectorHAL *hostHAL) : CollectorHAL(), cEnabled(0), mMachine(machine), mConsole(NULL), mGuest(NULL), mLastTick(0),
                                               mCpuUser(0), mCpuKernel(0), mCpuIdle(0), mMemTotal(0), mMemFree(0), mMemBalloon(0),
-                                              mMemCache(0), mPageTotal(0) {};
+                                              mMemCache(0), mPageTotal(0), mHostHAL(hostHAL) {};
         ~CollectorGuestHAL();
 
@@ -203 +218 @@
         ComPtr<IGuest>       mGuest;
         uint64_t             mLastTick;
+
+        CollectorHAL        *mHostHAL;
 
         ULONG                mCpuUser;

trunk/src/VBox/Main/win/PerformanceWin.cpp

@@ -99 +99 @@
 }
 
-CollectorWin::CollectorWin() : mhNtDll(0)
+CollectorWin::CollectorWin() : CollectorHAL(), mhNtDll(0)
 {
     mpfnGetSystemTimes = (PFNGST)GetProcAddress(