Changeset 27998 in vbox for trunk/src/VBox/Main/include

Timestamp:

Apr 6, 2010 11:39:20 AM (15 years ago)

Author:

vboxsync

Message:

Dropped Guest/Pagefile/Usage/Free

Location:

trunk/src/VBox/Main/include

Files:

• GuestImpl.h (modified) (1 diff)
• Performance.h (modified) (6 diffs)

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

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

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

@@ -168 +168 @@
         CollectorGuestHAL(Machine *machine) : 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), mPageFree(0) {};
+                                              mMemCache(0), mPageTotal(0) {};
         ~CollectorGuestHAL();
 
@@ -187 +187 @@
 
         /** Return guest memory information in kb. */
-        void getGuestMemLoad(ULONG *pulMemTotal, ULONG *pulMemFree, ULONG *pulMemBalloon, ULONG *pulMemCache, ULONG *pulPageTotal, ULONG *pulPageFree)
+        void getGuestMemLoad(ULONG *pulMemTotal, ULONG *pulMemFree, ULONG *pulMemBalloon, ULONG *pulMemCache, ULONG *pulPageTotal)
         {
             *pulMemTotal   = mMemTotal;
@@ -194 +194 @@
             *pulMemCache   = mMemCache;
             *pulPageTotal  = mPageTotal;
-            *pulPageFree   = mPageFree;
         }
 
@@ -213 +212 @@
         ULONG                mMemCache;
         ULONG                mPageTotal;
-        ULONG                mPageFree;
     };
 
@@ -414 +412 @@
     {
     public:
-        GuestRamUsage(CollectorGuestHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *free, SubMetric *balloon, SubMetric *cache, SubMetric *pagedtotal, SubMetric *pagedfree)
-        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mFree(free), mBallooned(balloon), mCache(cache), mPagedTotal(pagedtotal), mPagedFree(pagedfree), mGuestHAL(hal) {};
-        ~GuestRamUsage() { delete mTotal; delete mFree; delete mBallooned; delete mCache; delete mPagedTotal; delete mPagedFree; };
+        GuestRamUsage(CollectorGuestHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *free, SubMetric *balloon, SubMetric *cache, SubMetric *pagedtotal)
+        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mFree(free), mBallooned(balloon), mCache(cache), mPagedTotal(pagedtotal), mGuestHAL(hal) {};
+        ~GuestRamUsage() { delete mTotal; delete mFree; delete mBallooned; delete mCache; delete mPagedTotal; };
 
         void init(ULONG period, ULONG length);
@@ -426 +424 @@
         ULONG getScale() { return 1; }
     private:
-        SubMetric *mTotal, *mFree, *mBallooned, *mCache, *mPagedTotal, *mPagedFree;
+        SubMetric *mTotal, *mFree, *mBallooned, *mCache, *mPagedTotal;
         CollectorGuestHAL *mGuestHAL;
     };