Changeset 26419 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 10, 2010 11:21:14 PM (15 years ago)

Author:

vboxsync

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

57523

Message:

tstRTMemCache: Testcase + bug fixes. Works pretty well, but should try tune it a bit.

Location:

trunk/src/VBox/Runtime

Files:

• common/alloc/memcache.cpp (modified) (8 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTMemCache.cpp (added)

trunk/src/VBox/Runtime/common/alloc/memcache.cpp

@@ -207 +207 @@
             while (iObj-- > 0)
                 if (ASMBitTestAndClear(pPage->pbmCtor, iObj))
-                    pThis->pfnDtor(hMemCache, (uint8_t *)pPage->pbObjects + iObj * pThis->cPerPage, pThis->pvUser);
+                    pThis->pfnDtor(hMemCache, pPage->pbObjects + iObj * pThis->cbObject, pThis->pvUser);
         }
 
@@ -238 +238 @@
          */
         PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)RTMemPageAlloc(PAGE_SIZE);
-        if (!pPage)
-        {
-            uint32_t cObjects = pThis->cPerPage;
-            if (pThis->cTotal + cObjects > pThis->cMax)
-                cObjects = pThis->cTotal - pThis->cMax;
+        if (pPage)
+        {
+            uint32_t const cObjects = RT_MIN(pThis->cPerPage, pThis->cMax - pThis->cTotal);
 
             ASMMemZeroPage(pPage);
@@ -248 +246 @@
             pPage->pNext        = NULL;
             pPage->cFree        = cObjects;
-            pPage->pbmAlloc     = (pThis + 1);
+            pPage->cObjects     = cObjects;
+            pPage->pbmAlloc     = pPage + 1;
             pPage->pbmCtor      = (uint8_t *)pPage->pbmAlloc + pThis->cBits / 8;
             pPage->pbObjects    = (uint8_t *)pPage->pbmCtor  + pThis->cBits / 8;
@@ -317 +316 @@
         {
             ASMAtomicIncS32(&pThis->cFree);
-            return VERR_CACHE_EMPTY;
+            return VERR_MEM_CACHE_MAX_SIZE;
         }
 
@@ -369 +368 @@
             else if (!ASMAtomicBitTestAndSet(pPage->pbmAlloc, iObj))
                 break;
-            Assert(cLoops2 != 2);
-            Assert(cLoops2 != 10);
+            Assert(cLoops2 != 40);
         }
         Assert(iObj >= 0);
     }
     void *pvObj = &pPage->pbObjects[iObj * pThis->cbObject];
+    Assert((uintptr_t)pvObj - (uintptr_t)pPage < PAGE_SIZE);
 
     /*
@@ -391 +390 @@
     }
 
+    *ppvObj = pvObj;
     return VINF_SUCCESS;
 }
@@ -423 +423 @@
      * Find the cache page.  The page structure is at the start of the page.
      */
-    PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)(((uintptr_t)pvObj) & ~(uintptr_t)PAGE_SIZE);
+    PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)(((uintptr_t)pvObj) & ~(uintptr_t)PAGE_OFFSET_MASK);
     AssertReturnVoid(pPage->pCache == pThis);
     AssertReturnVoid(ASMAtomicUoReadS32(&pPage->cFree) < (int32_t)pThis->cPerPage);
@@ -430 +430 @@
      * Clear the bitmap bit and update the two object counter. Order matters!
      */
-    uintptr_t iObj = (uintptr_t)pvObj - (uintptr_t)pPage->pbObjects;
-    AssertReturnVoid(iObj < pThis->cPerPage);
+    uintptr_t offObj = (uintptr_t)pvObj - (uintptr_t)pPage->pbObjects;
+    uintptr_t iObj   = offObj / pThis->cbObject;
+    AssertReturnVoid(iObj * pThis->cbObject == offObj);
+    Assert(iObj < pThis->cPerPage);
     AssertReturnVoid(ASMAtomicBitTestAndClear(pPage->pbmAlloc, iObj));
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -78 +78 @@
         tstLog \
         tstMemAutoPtr \
+        tstRTMemCache \
         tstRTMemPool \
         tstRTR0MemUserKernelDriver \
@@ -309 +310 @@
 tstMemAutoPtr_SOURCES = tstMemAutoPtr.cpp
 
+tstRTMemCache_TEMPLATE = VBOXR3TSTEXE
+tstRTMemCache_SOURCES = tstRTMemCache.cpp
+
 tstRTMemPool_TEMPLATE = VBOXR3TSTEXE
 tstRTMemPool_SOURCES = tstRTMemPool.cpp