Changeset 27302 in vbox for trunk

Timestamp:

Mar 11, 2010 8:11:17 PM (15 years ago)

Author:

vboxsync

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

58714

Message:

IPRT: RIP RTCache*, RTMemCache* is way better...

Location:

trunk

Files:

• include/iprt/cache.h (deleted)
• src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (9 diffs)
• src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (10 diffs)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (2 diffs)
• src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/misc/cache.cpp (deleted)
• src/VBox/Runtime/testcase/tstRTMemCache.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -35 +35 @@
 #ifdef IN_RING3
 # include <iprt/alloc.h>
-# include <iprt/cache.h>
+# include <iprt/memcache.h>
 # include <iprt/param.h>
 # include <iprt/uuid.h>
@@ -369 +369 @@
 
     /** Cache for task states. */
-    R3PTRTYPE(PRTOBJCACHE)          pTaskCache;
+    R3PTRTYPE(RTMEMCACHE)           hTaskCache;
 
     /** Device state for BIOS access. */
@@ -1766 +1766 @@
     uint32_t           uTargetDevice;
 
-    rc = RTCacheRequest(pBusLogic->pTaskCache, (void **)&pTaskState);
+    rc = RTMemCacheAllocEx(pBusLogic->hTaskCache, (void **)&pTaskState);
     AssertMsgRCReturn(rc, ("Getting task from cache failed rc=%Rrc\n", rc), rc);
 
@@ -1795 +1795 @@
         AssertMsgRCReturn(rc, ("Finishing BIOS SCSI request failed rc=%Rrc\n", rc), rc);
 
-        rc = RTCacheInsert(pBusLogic->pTaskCache, pTaskState);
-        AssertMsgRCReturn(rc, ("Getting task from cache failed rc=%Rrc\n", rc), rc);
+        RTMemCacheFree(pBusLogic->hTaskCache, pTaskState);
     }
     else
@@ -1988 +1987 @@
 
     /* Add task to the cache. */
-    rc = RTCacheInsert(pBusLogic->pTaskCache, pTaskState);
-    AssertMsgRC(rc, ("Inserting task state into cache failed rc=%Rrc\n", rc));
-
+    RTMemCacheFree(pBusLogic->hTaskCache, pTaskState);
     return VINF_SUCCESS;
 }
@@ -2006 +2003 @@
     int rc;
 
-    rc = RTCacheRequest(pBusLogic->pTaskCache, (void **)&pTaskState);
+    rc = RTMemCacheAllocEx(pBusLogic->hTaskCache, (void **)&pTaskState);
     AssertMsgReturn(RT_SUCCESS(rc) && (pTaskState != NULL), ("Failed to get task state from cache\n"), rc);
 
@@ -2079 +2076 @@
                                         BUSLOGIC_MAILBOX_INCOMING_COMPLETION_WITH_ERROR);
 
-            rc = RTCacheInsert(pBusLogic->pTaskCache, pTaskState);
-            AssertMsgRC(rc, ("Failed to insert task state into cache rc=%Rrc\n", rc));
+            RTMemCacheFree(pBusLogic->hTaskCache, pTaskState);
         }
         else
@@ -2510 +2506 @@
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
 
-    int rc = RTCacheDestroy(pThis->pTaskCache);
+    int rc = RTMemCacheDestroy(pThis->hTaskCache);
     AssertMsgRC(rc, ("Destroying task cache failed rc=%Rrc\n", rc));
 
@@ -2591 +2587 @@
 
     /* Initialize task cache. */
-    rc = RTCacheCreate(&pThis->pTaskCache, 0 /* unlimited */, sizeof(BUSLOGICTASKSTATE), RTOBJCACHE_PROTECT_INSERT);
+    rc = RTMemCacheCreate(&pThis->hTaskCache, sizeof(BUSLOGICTASKSTATE), 0, UINT32_MAX,
+                          NULL, NULL, NULL, 0);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -30 +30 @@
 #include <iprt/string.h>
 #ifdef IN_RING3
-# include <iprt/cache.h>
+# include <iprt/memcache.h>
 # include <iprt/mem.h>
 # include <iprt/param.h>
@@ -270 +270 @@
     VBOXSCSI                       VBoxSCSI;
     /** Cache for allocated tasks. */
-    R3PTRTYPE(PRTOBJCACHE)         pTaskCache;
+    R3PTRTYPE(RTMEMCACHE)          hTaskCache;
     /** Status LUN: The base interface. */
     PDMIBASE                       IBase;
@@ -1940 +1940 @@
 
     lsilogicFinishAddressReply(pLsiLogic, &pTaskState->IOCReply, false);
-    RTCacheInsert(pLsiLogic->pTaskCache, pTaskState);
+    RTMemCacheFree(pLsiLogic->hTaskCache, pTaskState);
 
     return rc;
@@ -2012 +2012 @@
     }
 
-    RTCacheInsert(pLsiLogic->pTaskCache, pTaskState);
+    RTMemCacheFree(pLsiLogic->hTaskCache, pTaskState);
 
     return VINF_SUCCESS;
@@ -3373 +3373 @@
 
         /* Get new task state. */
-        rc = RTCacheRequest(pLsiLogic->pTaskCache, (void **)&pTaskState);
+        rc = RTMemCacheAllocEx(pLsiLogic->hTaskCache, (void **)&pTaskState);
         AssertRC(rc);
 
@@ -3438 +3438 @@
                 rc = lsilogicProcessMessageRequest(pLsiLogic, &pTaskState->GuestRequest.Header, &Reply);
                 AssertRC(rc);
-                RTCacheInsert(pLsiLogic->pTaskCache, pTaskState);
+                RTMemCacheFree(pLsiLogic->hTaskCache, pTaskState);
             }
 
@@ -3514 +3514 @@
     uint32_t           uTargetDevice;
 
-    rc = RTCacheRequest(pLsiLogic->pTaskCache, (void **)&pTaskState);
+    rc = RTMemCacheAllocEx(pLsiLogic->hTaskCache, (void **)&pTaskState);
     AssertMsgRCReturn(rc, ("Getting task from cache failed rc=%Rrc\n", rc), rc);
 
@@ -3554 +3554 @@
     AssertMsgRCReturn(rc, ("Finishing BIOS SCSI request failed rc=%Rrc\n", rc), rc);
 
-    rc = RTCacheInsert(pLsiLogic->pTaskCache, pTaskState);
-    AssertMsgRCReturn(rc, ("Getting task from cache failed rc=%Rrc\n", rc), rc);
-
+    RTMemCacheFree(pLsiLogic->hTaskCache, pTaskState);
     return rc;
 }
@@ -4364 +4362 @@
     /* Destroy task cache. */
     int rc = VINF_SUCCESS;
-    if (pThis->pTaskCache)
-        rc = RTCacheDestroy(pThis->pTaskCache);
+    if (pThis->hTaskCache != NIL_RTMEMCACHE)
+        rc = RTMemCacheDestroy(pThis->hTaskCache);
 
     lsilogicConfigurationPagesFree(pThis);
@@ -4552 +4550 @@
      * Allocate task cache.
      */
-    rc = RTCacheCreate(&pThis->pTaskCache, 0, sizeof(LSILOGICTASKSTATE), RTOBJCACHE_PROTECT_INSERT);
+    rc = RTMemCacheCreate(&pThis->hTaskCache, sizeof(LSILOGICTASKSTATE), 0, UINT32_MAX,
+                          NULL, NULL, NULL, 0);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -33 +33 @@
 #include <iprt/file.h>
 #include <iprt/string.h>
-#include <iprt/cache.h>
 #include <iprt/tcp.h>
 #include <iprt/semaphore.h>
@@ -1203 +1202 @@
                 break;
             }
-            rc = CFGMR3QueryBoolDef(pCurNode, "UseNewIo", &fUseNewIo, false);
+            rc = CFGMR3QueryBoolDef(pCurNode, "UseNewIo", &fUseNewIo, true);
             if (RT_FAILURE(rc))
             {

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1452 +1452 @@
     GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueR0);
     GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueRC);
-    GEN_CHECK_OFF(BUSLOGIC, pTaskCache);
+    GEN_CHECK_OFF(BUSLOGIC, hTaskCache);
     GEN_CHECK_OFF(BUSLOGIC, VBoxSCSI);
     GEN_CHECK_OFF(BUSLOGIC, aDeviceStates);
@@ -1520 +1520 @@
     GEN_CHECK_OFF(LSILOGICSCSI, enmCtrlType);
     GEN_CHECK_OFF(LSILOGICSCSI, VBoxSCSI);
-    GEN_CHECK_OFF(LSILOGICSCSI, pTaskCache);
+    GEN_CHECK_OFF(LSILOGICSCSI, hTaskCache);
     GEN_CHECK_OFF(LSILOGICSCSI, IBase);
     GEN_CHECK_OFF(LSILOGICSCSI, ILeds);

trunk/src/VBox/Runtime/Makefile.kmk

@@ -258 +258 @@
         common/misc/assert.cpp \
         common/misc/buildconfig.cpp \
-        common/misc/cache.cpp \
         common/misc/cidr.cpp \
         common/misc/getopt.cpp \

trunk/src/VBox/Runtime/testcase/tstRTMemCache.cpp

@@ -36 +36 @@
 #include <iprt/asm.h>
 #include <iprt/err.h>
-#include <iprt/cache.h>
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
@@ -58 +57 @@
     uint32_t            cbObject;
     bool                fUseCache;
-    bool                fUseOldCache;
 } TST3THREAD, *PTST3THREAD;
 
@@ -69 +67 @@
 /** Global mem cache handle for use in some of the testcases. */
 static RTMEMCACHE           g_hMemCache;
-/** For testcase 3. */
-static PRTOBJCACHE          g_pOldCacheTst3;
 /** Stop indicator for tst3 threads.  */
 static bool volatile        g_fTst3Stop;
@@ -235 +231 @@
         }
     }
-    else if (pThread->fUseOldCache)
-    {
-        while (!g_fTst3Stop)
-        {
-            void *apv[64];
-
-            for (unsigned i = 0; i < RT_ELEMENTS(apv); i++)
-            {
-                apv[i] = NULL;
-                RTTEST_CHECK_RC_OK(g_hTest, RTCacheRequest(g_pOldCacheTst3, &apv[i]));
-            }
-
-            for (unsigned i = 0; i < RT_ELEMENTS(apv); i++)
-                RTCacheInsert(g_pOldCacheTst3, apv[i]);
-
-            cIterations += RT_ELEMENTS(apv);
-        }
-    }
     else
     {
@@ -284 +262 @@
     RTTestISubF("Benchmark - %u threads, %u bytes, %u secs, %s", cThreads, cbObject, cSecs,
                 iMethod == 0 ? "RTMemCache"
-                : iMethod == 1 ? "RTCache"
                 : "RTMemAlloc");
 
@@ -292 +269 @@
      */
     RTTESTI_CHECK_RC_RETV(RTMemCacheCreate(&g_hMemCache, cbObject, 0 /*cbAlignment*/, UINT32_MAX, NULL, NULL, NULL, 0 /*fFlags*/), VINF_SUCCESS);
-    RTTESTI_CHECK_RC_RETV(RTCacheCreate(&g_pOldCacheTst3, 0, cbObject, RTOBJCACHE_PROTECT_INSERT | RTOBJCACHE_PROTECT_REQUEST), VINF_SUCCESS);
 
     RTSEMEVENTMULTI hEvt;
@@ -306 +282 @@
         aThreads[i].cIterations = 0;
         aThreads[i].fUseCache   = iMethod == 0;
-        aThreads[i].fUseOldCache= iMethod == 1;
         aThreads[i].cbObject    = cbObject;
         aThreads[i].hEvt        = hEvt;
@@ -338 +313 @@
 
     /* clean up */
-    RTTESTI_CHECK_RC(RTCacheDestroy(g_pOldCacheTst3), VINF_SUCCESS);
     RTTESTI_CHECK_RC(RTMemCacheDestroy(g_hMemCache), VINF_SUCCESS);
     RTTESTI_CHECK_RC_OK(RTSemEventMultiDestroy(hEvt));
@@ -347 +321 @@
     tst3(cThreads, cbObject, 0, cSecs);
     tst3(cThreads, cbObject, 1, cSecs);
-    tst3(cThreads, cbObject, 2, cSecs);
 }