Changeset 28036 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Apr 7, 2010 9:47:43 AM (15 years ago)

Author:

vboxsync

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

59743

Message:

More metrics changes

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (3 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -2998 +2998 @@
  * @param   pReq            The request packet.
  */
-GMMR0DECL(int) GMMR0QueryTotalFreePagesReq(PVM pVM, PGMMFREEQUERYREQ pReq)
+GMMR0DECL(int) GMMR0QueryVMMMemoryStatsReq(PVM pVM, PGMMMEMSTATSREQ pReq)
 {
     /*
@@ -3005 +3005 @@
     AssertPtrReturn(pVM, VERR_INVALID_POINTER);
     AssertPtrReturn(pReq, VERR_INVALID_POINTER);
-    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMFREEQUERYREQ),
-                    ("%#x < %#x\n", pReq->Hdr.cbReq, sizeof(GMMFREEQUERYREQ)),
+    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMMEMSTATSREQ),
+                    ("%#x < %#x\n", pReq->Hdr.cbReq, sizeof(GMMMEMSTATSREQ)),
                     VERR_INVALID_PARAMETER);
 
@@ -3014 +3014 @@
     PGMM pGMM;
     GMM_GET_VALID_INSTANCE(pGMM, VERR_INTERNAL_ERROR);
-    pReq->cFreePages = (pGMM->cChunks << GMM_CHUNK_SHIFT) - pGMM->cAllocatedPages; 
+    pReq->cAllocPages     = pGMM->cAllocatedPages; 
+    pReq->cFreePages      = (pGMM->cChunks << GMM_CHUNK_SHIFT) - pGMM->cAllocatedPages; 
+    pReq->cBalloonedPages = pGMM->cBalloonedPages; 
     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:
+        case VMMR0_DO_GMM_QUERY_VMM_MEM_STATS:
             if (u64Arg)
                 return VERR_INVALID_PARAMETER;
-            return GMMR0QueryTotalFreePagesReq(pVM, (PGMMFREEQUERYREQ)pReqHdr);
+            return GMMR0QueryVMMMemoryStatsReq(pVM, (PGMMMEMSTATSREQ)pReqHdr);
 
         case VMMR0_DO_GMM_BALLOONED_PAGES: