Changeset 27998 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Dropped Guest/Pagefile/Usage/Free

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -254 +254 @@
 STDMETHODIMP Guest::InternalGetStatistics(ULONG aCpuId, ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
                                           ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
-                                          ULONG *aPageTotal, ULONG *aPageFree)
+                                          ULONG *aPageTotal)
 {
     CheckComArgOutPointerValid(aCpuUser);
@@ -264 +264 @@
     CheckComArgOutPointerValid(aMemCache);
     CheckComArgOutPointerValid(aPageTotal);
-    CheckComArgOutPointerValid(aPageFree);
 
     AutoCaller autoCaller(this);
@@ -279 +278 @@
     *aMemCache = mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE];
     *aPageTotal = mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL];
-    *aPageFree = mCurrentGuestStat[GUESTSTATTYPE_PAGEFREE];
 
     return S_OK;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8962 +8962 @@
 
     pm::SubMetric *guestPagedTotal = new pm::SubMetric("Guest/Pagefile/Usage/Total",    "Total amount of space in the page file.");
-    pm::SubMetric *guestPagedFree = new pm::SubMetric("Guest/Pagefile/Usage/Free",      "Free amount of free space in the page file.");
 
     /* Create and register base metrics */
@@ -8969 +8968 @@
 
     pm::BaseMetric *guestCpuMem = new pm::GuestRamUsage(mGuestHAL, aMachine, guestMemTotal, guestMemFree, guestMemBalloon,
-                                                        guestMemCache, guestPagedTotal, guestPagedFree);
+                                                        guestMemCache, guestPagedTotal);
     aCollector->registerBaseMetric(guestCpuMem);
 
@@ -9011 +9010 @@
     aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, new pm::AggregateMin()));
     aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedTotal, new pm::AggregateMax()));
-
-    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, 0));
-    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, new pm::AggregateAvg()));
-    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, new pm::AggregateMin()));
-    aCollector->registerMetric(new pm::Metric(guestCpuMem, guestPagedFree, new pm::AggregateMax()));
 };
 

trunk/src/VBox/Main/Performance.cpp

@@ -170 +170 @@
         mGuest->InternalGetStatistics(0, &mCpuUser, &mCpuKernel, &mCpuIdle,
                                       &mMemTotal, &mMemFree, &mMemBalloon, &mMemCache,
-                                      &mPageTotal, &mPageFree);
+                                      &mPageTotal);
         mLastTick = iTick;
     }
@@ -408 +408 @@
     mCache->init(mLength);
     mPagedTotal->init(mLength);
-    mPagedFree->init(mLength);
 }
 
@@ -418 +417 @@
 void GuestRamUsage::collect()
 {
-    ULONG ulMemTotal = 0, ulMemFree = 0, ulMemBalloon = 0, ulMemCache = 0, ulPageTotal = 0, ulPageFree = 0;
-
-    mGuestHAL->getGuestMemLoad(&ulMemTotal, &ulMemFree, &ulMemBalloon, &ulMemCache, &ulPageTotal, &ulPageFree);
+    ULONG ulMemTotal = 0, ulMemFree = 0, ulMemBalloon = 0, ulMemCache = 0, ulPageTotal = 0;
+
+    mGuestHAL->getGuestMemLoad(&ulMemTotal, &ulMemFree, &ulMemBalloon, &ulMemCache, &ulPageTotal);
     mTotal->put(ulMemTotal);
     mFree->put(ulMemFree);
@@ -426 +425 @@
     mCache->put(ulMemCache);
     mPagedTotal->put(ulPageTotal);
-    mPagedFree->put(ulPageFree);
 }
 

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -68 +68 @@
     "RAM/Usage/Free:min",
     "RAM/Usage/Free:max",
+    "Guest/CPU/Load/User",
+    "Guest/CPU/Load/User:avg",
+    "Guest/CPU/Load/User:min",
+    "Guest/CPU/Load/User:max",
+    "Guest/CPU/Load/Kernel",
+    "Guest/CPU/Load/Kernel:avg",
+    "Guest/CPU/Load/Kernel:min",
+    "Guest/CPU/Load/Kernel:max",
+    "Guest/CPU/Load/Idle",
+    "Guest/CPU/Load/Idle:avg",
+    "Guest/CPU/Load/Idle:min",
+    "Guest/CPU/Load/Idle:max",
     "Guest/RAM/Usage/Total",
     "Guest/RAM/Usage/Total:avg",
@@ -88 +100 @@
     "Guest/Pagefile/Usage/Total:min",
     "Guest/Pagefile/Usage/Total:max",
-    "Guest/Pagefile/Usage/Free",
-    "Guest/Pagefile/Usage/Free:avg",
-    "Guest/Pagefile/Usage/Free:min",
-    "Guest/Pagefile/Usage/Free:max",
 };
 

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

@@ -8271 +8271 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="3fcf2078-3c69-45ca-bd5c-79c3e3c15362"
+    uuid="8cec1502-8869-42e3-9d9c-45f0d1bb0861"
     wsmap="struct"
   >
@@ -8452 +8452 @@
       <param name="pagedTotal" type="unsigned long" dir="out"> 
          <desc>Total amount of space in the page file</desc> 
-      </param> 
-      <param name="pagedFree" type="unsigned long" dir="out"> 
-         <desc>Free amount of space in the page file</desc> 
       </param> 
     </method> 

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