Changeset 28012 in vbox

Timestamp:

Apr 6, 2010 2:52:25 PM (15 years ago)

Author:

vboxsync

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

59719

Message:

Use PGMR3QueryFreeMemory instead

Location:

trunk

Files:

• include/VBox/gmm.h (modified) (2 diffs)
• include/VBox/pgm.h (modified) (1 diff)
• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/Main/GuestImpl.cpp (modified) (3 diffs)
• src/VBox/Main/HostImpl.cpp (modified) (3 diffs)
• src/VBox/Main/Performance.cpp (modified) (2 diffs)
• src/VBox/Main/PerformanceImpl.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/GuestImpl.h (modified) (1 diff)
• src/VBox/Main/include/Performance.h (modified) (4 diffs)
• src/VBox/VMM/GMM.cpp (modified) (1 diff)
• src/VBox/VMM/PGMPhys.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/include/VBox/gmm.h

@@ -399 +399 @@
 
 /**
- * Request buffer for GMMR0QueryTotalBalloonSizeReq / VMMR0_DO_GMM_BALLOONED_PAGES.
- * @see GMMR0QueryTotalBalloonSize.
- */
-typedef struct GMMBALLOONQUERY
+ * Request buffer for GMMR0QueryTotalFreePagesReq / VMMR0_DO_GMM_QUERY_TOTAL_FREE_PAGES.
+ * @see GMMR0QueryTotalFreePagesReq.
+ */
+typedef struct GMMFREEQUERYREQ
 {
     /** The header. */
     SUPVMMR0REQHDR      Hdr;
-    /** The number of ballooned pages (out). */
-    uint64_t            cBalloonedPages;
-} GMMBALLOONQUERYREQ;
-/** Pointer to a GMMR0QueryTotalBalloonSizeReq / VMMR0_DO_GMM_QUERY_TOTAL_BALLOON_SIZE request buffer. */
-typedef GMMBALLOONQUERYREQ *PGMMBALLOONQUERYREQ;
-
-GMMR0DECL(int)  GMMR0QueryTotalBalloonSizeReq(PVM pVM, PGMMBALLOONQUERYREQ pReq);
+    /** The number of free pages (out). */
+    uint64_t            cFreePages;
+} GMMFREEQUERYREQ;
+/** Pointer to a GMMR0QueryTotalFreePagesReq / VMMR0_DO_GMM_QUERY_TOTAL_FREE_PAGES request buffer. */
+typedef GMMFREEQUERYREQ *PGMMFREEQUERYREQ;
+
+GMMR0DECL(int)  GMMR0QueryTotalFreePagesReq(PVM pVM, PGMMFREEQUERYREQ pReq);
 
 /**
@@ -473 +473 @@
 GMMR3DECL(int)  GMMR3SeedChunk(PVM pVM, RTR3PTR pvR3);
 GMMR3DECL(int)  GMMR3BalloonedPages(PVM pVM, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages);
-GMMR3DECL(int)  GMMR3QueryTotalBalloonSize(PVM pVM, uint64_t *pcTotalBalloonedPages);
+GMMR3DECL(int)  GMMR3QueryTotalFreePages(PVM pVM, uint64_t *pcTotalFreePages);
 /** @} */
 #endif /* IN_RING3 */

trunk/include/VBox/pgm.h

@@ -467 +467 @@
 VMMR3DECL(int)      PGMR3PhysRegisterRam(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, const char *pszDesc);
 VMMR3DECL(int)      PGMR3PhysChangeMemBalloon(PVM pVM, bool fInflate, unsigned cPages, RTGCPHYS *paPhysPage);
-VMMR3DECL(int)      PGMR3QueryBalloonSize(PVM pVM, unsigned *puVMBalloonSize, unsigned *puTotalBalloonSize);
+VMMR3DECL(int)      PGMR3QueryFreeMemory(PVM pVM, unsigned *puTotalFreeSize);
 VMMR3DECL(int)      PGMR3PhysMMIORegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb,
                                           R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,

trunk/include/VBox/vmm.h

@@ -300 +300 @@
     /** Call GMMR0FreeLargePage(). */
     VMMR0_DO_GMM_FREE_LARGE_PAGE,
+    /** Call GMMR0QueryTotalFreePagesReq */
+    VMMR0_DO_GMM_QUERY_TOTAL_FREE_PAGES,
     /** Call GMMR0BalloonedPages(). */
     VMMR0_DO_GMM_BALLOONED_PAGES,
-    /** Call GMMR0QueryTotalBalloonSize*/
-    VMMR0_DO_GMM_QUERY_TOTAL_BALLOON_SIZE,
     /** Call GMMR0MapUnmapChunk(). */
     VMMR0_DO_GMM_MAP_UNMAP_CHUNK,

trunk/src/VBox/Main/GuestImpl.cpp

@@ -254 +254 @@
 
 STDMETHODIMP Guest::InternalGetStatistics(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
-                                          ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemBalloonTotal,
-                                          ULONG *aMemCache, ULONG *aPageTotal)
+                                          ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, 
+                                          ULONG *aMemCache, ULONG *aPageTotal, ULONG *aMemFreeTotal)
 {
     CheckComArgOutPointerValid(aCpuUser);
@@ -276 +276 @@
     *aMemTotal = mCurrentGuestStat[GUESTSTATTYPE_MEMTOTAL];
     *aMemFree = mCurrentGuestStat[GUESTSTATTYPE_MEMFREE];
-
+    *aMemBalloon = mCurrentGuestStat[GUESTSTATTYPE_MEMBALLOON];
     *aMemCache = mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE];
     *aPageTotal = mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL];
@@ -283 +283 @@
     if (pVM.isOk())
     {
-        unsigned uBalloon, uBalloonTotal;
-        *aMemBalloon      = 0;
-        *aMemBalloonTotal = 0;
-        int rc = PGMR3QueryBalloonSize(pVM.raw(), &uBalloon, &uBalloonTotal);
+        unsigned uFreeTotal;
+        *aMemFreeTotal = 0;
+        int rc = PGMR3QueryFreeMemory(pVM.raw(), &uFreeTotal);
         AssertRC(rc);
         if (rc == VINF_SUCCESS)
-        {
-            *aMemBalloon      = uBalloon;
-            *aMemBalloonTotal = uBalloonTotal;
-        }
+            *aMemFreeTotal = uFreeTotal;
     }
     else
-    {
-        *aMemBalloon      = 0;
-        *aMemBalloonTotal = 0;
-    }
+        *aMemFreeTotal = 0;
 
     return S_OK;

trunk/src/VBox/Main/HostImpl.cpp

@@ -2411 +2411 @@
     pm::SubMetric *ramUsageFree  = new pm::SubMetric("RAM/Usage/Free",
         "Physical memory currently available to applications.");
-    pm::SubMetric *ramUsageBalloon = new pm::SubMetric("RAM/Usage/Ballooned",
-        "Physical memory currently available from guest balloons.");
+
     /* Create and register base metrics */
     IUnknown *objptr;
@@ -2423 +2422 @@
     aCollector->registerBaseMetric (cpuMhz);
     pm::BaseMetric *ramUsage = new pm::HostRamUsage(hal, objptr, ramUsageTotal, ramUsageUsed,
-                                           ramUsageFree, ramUsageBalloon);
+                                           ramUsageFree);
     aCollector->registerBaseMetric (ramUsage);
 
@@ -2481 +2480 @@
     aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree,
                                               new pm::AggregateMax()));
-
-    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon, 0));
-    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon,
-                                              new pm::AggregateAvg()));
-    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon,
-                                              new pm::AggregateMin()));
-    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageBalloon,
-                                              new pm::AggregateMax()));
 };
 

trunk/src/VBox/Main/Performance.cpp

@@ -168 +168 @@
         &&  iTick != mLastTick)
     {
-        ULONG ulMemBalloonTotal;
+        ULONG ulMemFreeTotal;
 
         mGuest->InternalGetStatistics(&mCpuUser, &mCpuKernel, &mCpuIdle,
-                                      &mMemTotal, &mMemFree, &mMemBalloon, &ulMemBalloonTotal, &mMemCache,
-                                      &mPageTotal);
+                                      &mMemTotal, &mMemFree, &mMemBalloon, &mMemCache,
+                                      &mPageTotal, &ulMemFreeTotal);
 
         if (mHostHAL)
-            mHostHAL->setBalloonSize(ulMemBalloonTotal);
+            mHostHAL->setMemFreeTotal(ulMemFreeTotal);
 
         mLastTick = iTick;
@@ -303 +303 @@
         mTotal->put(total);
         mUsed->put(used);
-        mAvailable->put(available);
-    }
-    mBallooned->put(mHAL->getBalloonSize());
+        mAvailable->put(available + mHAL->getMemFreeTotal());
+    }
 }
 

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -68 +68 @@
     "RAM/Usage/Free:min",
     "RAM/Usage/Free:max",
-    "RAM/Usage/Ballooned",
-    "RAM/Usage/Ballooned:avg",
-    "RAM/Usage/Ballooned:min",
-    "RAM/Usage/Ballooned:max",
     "Guest/CPU/Load/User",
     "Guest/CPU/Load/User:avg",

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

@@ -8444 +8444 @@
          <desc>Amount of ballooned physical guest RAM</desc> 
       </param> 
-      <param name="memBalloonTotal" type="unsigned long" dir="out"> 
-         <desc>Amount of ballooned physical guest RAM for all running VMs</desc> 
-      </param> 
       <param name="memCache" type="unsigned long" dir="out"> 
          <desc>Total amount of guest (disk) cache memory</desc> 
@@ -8452 +8449 @@
       <param name="pagedTotal" type="unsigned long" dir="out"> 
          <desc>Total amount of space in the page file</desc> 
+      </param> 
+      <param name="memFreeTotal" type="unsigned long" dir="out"> 
+         <desc>Total amount of free memory available in VMMR0</desc> 
       </param> 
     </method> 

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

@@ -89 +89 @@
                               ULONG aTimeoutMS, ULONG* aPID, IProgress **aProgress);
     STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
-                                     ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemBalloonTotal, ULONG *aMemCache,
-                                     ULONG *aPageTotal);
+                                     ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
+                                     ULONG *aPageTotal, ULONG *aMemFreeTotal);
 
     // public methods that are not in IDL

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

@@ -139 +139 @@
     {
     public:
-                 CollectorHAL() : mMemBalloonTotal(0) {};
+                 CollectorHAL() : mMemFreeTotal(0) {};
         virtual ~CollectorHAL() { };
         virtual int preCollect(const CollectorHints& /* hints */, uint64_t /* iTick */) { return VINF_SUCCESS; }
@@ -163 +163 @@
         virtual int disable();
 
-        virtual int setBalloonSize(ULONG balloonsize)
-        {
-            mMemBalloonTotal = balloonsize;
+        virtual int setMemFreeTotal(ULONG memfree)
+        {
+            mMemFreeTotal = memfree;
             return S_OK;
         }
 
-        virtual ULONG getBalloonSize()
-        {
-            return mMemBalloonTotal;
-        }
-
-    private:
-        ULONG       mMemBalloonTotal;
+        virtual ULONG getMemFreeTotal()
+        {
+            return mMemFreeTotal;
+        }
+
+    private:
+        ULONG       mMemFreeTotal;
     };
 
@@ -335 +335 @@
     {
     public:
-        HostRamUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *used, SubMetric *available, SubMetric *ballooned)
-        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mUsed(used), mAvailable(available), mBallooned(ballooned) {};
-        ~HostRamUsage() { delete mTotal; delete mUsed; delete mAvailable; delete mBallooned; };
+        HostRamUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *used, SubMetric *available)
+        : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mUsed(used), mAvailable(available) {};
+        ~HostRamUsage() { delete mTotal; delete mUsed; delete mAvailable; };
 
         void init(ULONG period, ULONG length);
@@ -350 +350 @@
         SubMetric *mUsed;
         SubMetric *mAvailable;
-        SubMetric *mBallooned;
     };
 

trunk/src/VBox/VMM/GMM.cpp

@@ -291 +291 @@
 
 /**
- * @see GMMR0QueryTotalBalloonSizeReq
- */
-GMMR3DECL(int)  GMMR3QueryTotalBalloonSize(PVM pVM, uint64_t *pcTotalBalloonedPages)
-{
-    GMMBALLOONQUERYREQ Req;
-    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    Req.Hdr.cbReq = sizeof(Req);
-    Req.cBalloonedPages = 0;
-
-    *pcTotalBalloonedPages = 0;
-    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_QUERY_TOTAL_BALLOON_SIZE, 0, &Req.Hdr);
+ * @see GMMR0QueryTotalFreePagesReq
+ */
+GMMR3DECL(int)  GMMR3QueryTotalFreePages(PVM pVM, uint64_t *pcTotalFreePages)
+{
+    GMMFREEQUERYREQ Req;
+    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    Req.Hdr.cbReq = sizeof(Req);
+    Req.cFreePages = 0;
+
+    *pcTotalFreePages = 0;
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_QUERY_TOTAL_FREE_PAGES, 0, &Req.Hdr);
     if (rc == VINF_SUCCESS)
-        *pcTotalBalloonedPages = Req.cBalloonedPages;
+        *pcTotalFreePages = Req.cFreePages;
 
     return rc;

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -954 +954 @@
 
 /**
- * Query the VM and host balloon sizes
+ * Query the amount of free memory inside VMMR0
  *
  * @returns VBox status code.
  * @param   pVM                 The VM handle.
- * @param   puVMBalloonSize     Pointer to VM balloon size (in megabytes)
- * @param   puTotalBalloonSize  Pointer to total balloon size of all VMs (in megabytes)
- */
-VMMR3DECL(int) PGMR3QueryBalloonSize(PVM pVM, unsigned *puVMBalloonSize, unsigned *puTotalBalloonSize)
+ * @param   puTotalFreeSize     Pointer to total free (allocated but not used yet) memory inside VMMR0 (in megabytes)
+ */
+VMMR3DECL(int) PGMR3QueryFreeMemory(PVM pVM, unsigned *puTotalFreeSize)
 {
     int rc = VINF_SUCCESS;
 
-    if (puVMBalloonSize)
-        *puVMBalloonSize = pVM->pgm.s.cBalloonedPages * _4K / _1M;
-
-    if (puTotalBalloonSize)
+    if (puTotalFreeSize)
     {
         uint64_t cPages = 0;
-        rc = GMMR3QueryTotalBalloonSize(pVM, &cPages);
+        rc = GMMR3QueryTotalFreePages(pVM, &cPages);
         AssertRC(rc);
-        *puTotalBalloonSize = (unsigned) (cPages * _4K / _1M);
+        *puTotalFreeSize = (unsigned) (cPages * _4K / _1M);
     }
 

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -2992 +2992 @@
 
 /**
- * Return the total amount of ballooned pages for all VMs
+ * Return the total amount of free pages
  *
  * @returns VBox status code:
@@ -2998 +2998 @@
  * @param   pReq            The request packet.
  */
-GMMR0DECL(int) GMMR0QueryTotalBalloonSizeReq(PVM pVM, PGMMBALLOONQUERYREQ pReq)
+GMMR0DECL(int) GMMR0QueryTotalFreePagesReq(PVM pVM, PGMMFREEQUERYREQ pReq)
 {
     /*
@@ -3005 +3005 @@
     AssertPtrReturn(pVM, VERR_INVALID_POINTER);
     AssertPtrReturn(pReq, VERR_INVALID_POINTER);
-    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMBALLOONQUERYREQ),
-                    ("%#x < %#x\n", pReq->Hdr.cbReq, sizeof(GMMBALLOONQUERYREQ)),
+    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMFREEQUERYREQ),
+                    ("%#x < %#x\n", pReq->Hdr.cbReq, sizeof(GMMFREEQUERYREQ)),
                     VERR_INVALID_PARAMETER);
 
@@ -3014 +3014 @@
     PGMM pGMM;
     GMM_GET_VALID_INSTANCE(pGMM, VERR_INTERNAL_ERROR);
-    pReq->cBalloonedPages = pGMM->cBalloonedPages;
+    pReq->cFreePages = (pGMM->cChunks << GMM_CHUNK_SHIFT) - pGMM->cAllocatedPages; 
     GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
 

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -910 +910 @@
             return GMMR0FreeLargePageReq(pVM, idCpu, (PGMMFREELARGEPAGEREQ)pReqHdr);
 
+        case VMMR0_DO_GMM_QUERY_TOTAL_FREE_PAGES:
+            if (u64Arg)
+                return VERR_INVALID_PARAMETER;
+            return GMMR0QueryTotalFreePagesReq(pVM, (PGMMFREEQUERYREQ)pReqHdr);
+
         case VMMR0_DO_GMM_BALLOONED_PAGES:
             if (u64Arg)
                 return VERR_INVALID_PARAMETER;
             return GMMR0BalloonedPagesReq(pVM, idCpu, (PGMMBALLOONEDPAGESREQ)pReqHdr);
-
-        case VMMR0_DO_GMM_QUERY_TOTAL_BALLOON_SIZE:
-            if (u64Arg)
-                return VERR_INVALID_PARAMETER;
-            return GMMR0QueryTotalBalloonSizeReq(pVM, (PGMMBALLOONQUERYREQ)pReqHdr);
 
         case VMMR0_DO_GMM_MAP_UNMAP_CHUNK: