Changeset 46199 in vbox for trunk/src

Timestamp:

May 21, 2013 7:49:19 PM (12 years ago)

Author:

vboxsync

Message:

strcache.cpp: Enabled it. Some tuning.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/dbg/dbgmod.cpp (modified) (1 diff)
• common/dbg/dbgmodexports.cpp (modified) (1 diff)
• common/string/strcache.cpp (modified) (4 diffs)
• testcase/tstRTStrCache.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -419 +419 @@
         common/string/stringalloc.cpp \
         common/string/strprintf.cpp \
+        common/string/strcache.cpp \
         common/string/strspace.cpp \
         common/string/strstrip.cpp \
@@ -489 +490 @@
         generic/semxroads-generic.cpp \
         generic/spinlock-generic.cpp \
-        generic/strcache-stubs-generic.cpp \
         generic/timerlr-generic.cpp \
         r3/alloc-ef.cpp \

trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

@@ -757 +757 @@
 #endif
         default:
+            rc = VERR_NOT_IMPLEMENTED;
             break;
     }

trunk/src/VBox/Runtime/common/dbg/dbgmodexports.cpp

@@ -97 +97 @@
     }
 
+    /* Add dummy segments for segments that doesn't get mapped. */
+    if (pSeg->LinkAddress == NIL_RTLDRADDR)
+        return RTDbgModSegmentAdd(pArgs->pDbgMod, 0, 0, pszName, 0 /*fFlags*/, NULL);
+
     RTLDRADDR cb = RT_MAX(pSeg->cb, pSeg->cbMapped);
     return RTDbgModSegmentAdd(pArgs->pDbgMod, pSeg->RVA, cb, pszName, 0 /*fFlags*/, NULL);

trunk/src/VBox/Runtime/common/string/strcache.cpp

@@ -75 +75 @@
  */
 #define RTSTRCACHE_MERGED_THRESHOLD_BIT     6
+
+
+/** The number of bytes (power of two) that the merged allocation lists should
+ * be grown by.  Must be much greater than RTSTRCACHE_MERGED_THRESHOLD. */
+#define RTSTRCACHE_MERGED_GROW_SIZE         _32K
+/** The number of bytes (power of two) that the fixed allocation lists should
+ * be grown by. */
+#define RTSTRCACHE_FIXED_GROW_SIZE          _32K
 
 /** Validates a string cache handle, translating RTSTRCACHE_DEFAULT when found,
@@ -556 +564 @@
          * cases, but it's too much effort to write and execute).
          */
-        size_t const     cbChunk = RTSTRCACHE_HEAP_THRESHOLD * 16;   AssertReturn(cbChunk > cbEntry * 2, NULL);
+        size_t const     cbChunk = RTSTRCACHE_MERGED_GROW_SIZE; AssertReturn(cbChunk > cbEntry * 2, NULL);
         PRTSTRCACHECHUNK pChunk  = (PRTSTRCACHECHUNK)RTMemPageAlloc(cbChunk);
         if (!pChunk)
@@ -628 +636 @@
     if (!pFree)
     {
-        PRTSTRCACHECHUNK pChunk = (PRTSTRCACHECHUNK)RTMemPageAlloc(PAGE_SIZE);
+        PRTSTRCACHECHUNK pChunk = (PRTSTRCACHECHUNK)RTMemPageAlloc(RTSTRCACHE_FIXED_GROW_SIZE);
         if (!pChunk)
             return NULL;
@@ -762 +770 @@
         if (cbEntry >= RTSTRCACHE_MERGED_THRESHOLD_BIT)
         {
-            if (cbEntry < RTSTRCACHE_HEAP_THRESHOLD * 2)
+            if (cbEntry <= RTSTRCACHE_HEAP_THRESHOLD)
                 pEntry = rtStrCacheAllocMergedEntry(pThis, uHash, pchString, cchString, cbEntry);
             else

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

@@ -88 +88 @@
         RTTESTI_CHECK(RTStrCacheRetain(psz) == 5);
         RTTESTI_CHECK(RTStrCacheRetain(psz) == 6);
-        RTTESTI_CHECK(RTStrCacheRelease(NIL_RTSTRCACHE, psz) == 5);
-        RTTESTI_CHECK(RTStrCacheRelease(NIL_RTSTRCACHE, psz) == 4);
+        RTTESTI_CHECK(RTStrCacheRelease(hStrCache, psz) == 5);
+        RTTESTI_CHECK(RTStrCacheRelease(hStrCache, psz) == 4);
         RTTESTI_CHECK_MSG_RETV((pv2 = ASMMemIsAll8(psz, i, 'a')) == NULL && !psz[i], ("i=%#x psz=%p off=%#x\n", i, psz, (uintptr_t)pv2 - (uintptr_t)psz));
 
@@ -107 +107 @@
             }
         }
+    }
+
+    /* Lots of allocations. */
+    memset(szTest, 'b', sizeof(szTest));
+    memset(szTest2, 'e', sizeof(szTest));
+    const char *pszTest1Rets[4096 + 16];
+    const char *pszTest2Rets[4096 + 16];
+    for (uint32_t i = 1; i < RT_ELEMENTS(pszTest1Rets); i++)
+    {
+        RTTESTI_CHECK(pszTest1Rets[i] = RTStrCacheEnterN(hStrCache, szTest, i));
+        RTTESTI_CHECK(strlen(pszTest1Rets[i]) == i);
+        RTTESTI_CHECK(pszTest2Rets[i] = RTStrCacheEnterN(hStrCache, szTest2, i));
+        RTTESTI_CHECK(strlen(pszTest2Rets[i]) == i);
+    }
+
+    for (uint32_t i = 1; i < RT_ELEMENTS(pszTest1Rets); i++)
+    {
+        uint32_t cRefs;
+        RTTESTI_CHECK(strlen(pszTest1Rets[i]) == i);
+        RTTESTI_CHECK_MSG((cRefs = RTStrCacheRelease(hStrCache, pszTest1Rets[i])) == 0, ("cRefs=%#x i=%#x\n", cRefs, i));
+        RTTESTI_CHECK(strlen(pszTest2Rets[i]) == i);
+        RTTESTI_CHECK_MSG((cRefs = RTStrCacheRelease(hStrCache, pszTest2Rets[i])) == 0, ("cRefs=%#x i=%#x\n", cRefs, i));
     }
 }