Changeset 82929 in vbox

Timestamp:

Jan 30, 2020 1:53:06 PM (5 years ago)

Author:

vboxsync

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

135912

Message:

PGMPool: Undid the OS X debug instrumentation. bugref:9627

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPool.cpp (modified) (9 diffs)
• VMMR3/PGMPool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -2026 +2026 @@
  * @param   pPool       The pool.
  * @param   iUser       The user index.
- * @param   pszTmpCaller OS X debugging.
- */
-static int pgmPoolCacheFreeOne(PPGMPOOL pPool, uint16_t iUser, const char *pszTmpCaller)
+ */
+static int pgmPoolCacheFreeOne(PPGMPOOL pPool, uint16_t iUser)
 {
     const PVMCC pVM = pPool->CTX_SUFF(pVM);
@@ -2057 +2056 @@
 */
         Assert(iToFree != iUser);
-        if (RT_LIKELY(iToFree != NIL_PGMPOOL_IDX)) /* Temporary OS X debugging */
-        { /* likely */ }
-        else
-        {
-            size_t cbPool = RT_UOFFSETOF_DYN(PGMPOOL, aPages[pPool->cMaxPages])
+        AssertReleaseMsg(iToFree != NIL_PGMPOOL_IDX,
+                         ("iToFree=%#x (iAgeTail=%#x) iUser=%#x iLoop=%u - pPool=%p LB %#zx\n",
+                          iToFree, pPool->iAgeTail, iUser, iLoop, pPool,
+                            RT_UOFFSETOF_DYN(PGMPOOL, aPages[pPool->cMaxPages])
                           + pPool->cMaxUsers * sizeof(PGMPOOLUSER)
-                          + pPool->cMaxPhysExts * sizeof(PGMPOOLPHYSEXT);
-            uint8_t *pbLastPage = (uint8_t *)pPool + ((cbPool - 1) & ~(uintptr_t)PAGE_OFFSET_MASK);
-            AssertReleaseMsg(iToFree != NIL_PGMPOOL_IDX, ("%s: iToFree=%#x (iAgeTail=%#x) iUser=%#x iLoop=%u - pPool=%p (LB %#zx):\n"
-                                                          "%.512Rhxd\n"
-                                                          "pLastPage=%p:\n"
-                                                          "%.4096Rhxd\n",
-                                                          pszTmpCaller, iToFree, pPool->iAgeTail, iUser, iLoop,
-                                                          pPool, cbPool, pPool, pbLastPage, pbLastPage));
-        }
+                          + pPool->cMaxPhysExts * sizeof(PGMPOOLPHYSEXT) ));
+
         pPage = &pPool->aPages[iToFree];
 
@@ -2804 +2795 @@
  * @param   pPool       The pool.
  * @param   iUser       The user index.
- * @param   pszTmpCaller Temporary OS X debugging.
- */
-static int pgmPoolTrackFreeOneUser(PPGMPOOL pPool, uint16_t iUser, const char *pszTmpCaller)
+ */
+static int pgmPoolTrackFreeOneUser(PPGMPOOL pPool, uint16_t iUser)
 {
     STAM_COUNTER_INC(&pPool->StatTrackFreeUpOneUser);
@@ -2816 +2806 @@
     do
     {
-        int rc2 = pgmPoolCacheFreeOne(pPool, iUser, pszTmpCaller);
+        int rc2 = pgmPoolCacheFreeOne(pPool, iUser);
         if (RT_FAILURE(rc2) && rc == VINF_SUCCESS)
             rc = rc2;
@@ -2870 +2860 @@
         if (i == NIL_PGMPOOL_USER_INDEX)
         {
-            rc = pgmPoolTrackFreeOneUser(pPool, iUser, __FUNCTION__);
+            rc = pgmPoolTrackFreeOneUser(pPool, iUser);
             if (RT_FAILURE(rc))
                 return rc;
@@ -2956 +2946 @@
     if (i == NIL_PGMPOOL_USER_INDEX)
     {
-        int rc = pgmPoolTrackFreeOneUser(pPool, iUser, __FUNCTION__);
+        int rc = pgmPoolTrackFreeOneUser(pPool, iUser);
         if (RT_FAILURE(rc))
             return rc;
@@ -4986 +4976 @@
      * If the pool isn't full grown yet, expand it.
      */
-const char *pszTmp = "pgmPoolMakeMoreFreePages/no-growth";
     if (pPool->cCurPages < pPool->cMaxPages)
     {
@@ -5000 +4989 @@
         if (pPool->iFreeHead != NIL_PGMPOOL_IDX)
             return VINF_SUCCESS;
-pszTmp = "pgmPoolMakeMoreFreePages/grew-it";
     }
 
@@ -5006 +4994 @@
      * Free one cached page.
      */
-    return pgmPoolCacheFreeOne(pPool, iUser, pszTmp);
+    return pgmPoolCacheFreeOne(pPool, iUser);
 }
 

trunk/src/VBox/VMM/VMMR3/PGMPool.cpp

@@ -234 +234 @@
     if (RT_FAILURE(rc))
         return rc;
-memset((uint8_t *)pPool + cb, 0xbb, RT_ALIGN_Z(cb, PAGE_SIZE) - cb); /* Temporary OS X debugging: Color the unused bytes (ASSUMES page aligned alloc). */
     pVM->pgm.s.pPoolR3 = pPool;
     pVM->pgm.s.pPoolR0 = MMHyperR3ToR0(pVM, pPool);
@@ -289 +288 @@
 
     pPool->HCPhysTree = 0;
-LogRel(("PGM: pgmR3PoolInit: pPool=%p LB %#x paUsers=%p paPhysExts=%p (pEnd=%p) pVM=%p\n",
-        pPool, cb, pPool->paUsersR3, pPool->paPhysExtsR3, (uint8_t *)pPool + cb, pVM)); // Temporary OS X debugging.
 
     /*