Changeset 20575 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Jun 15, 2009 1:52:07 AM (16 years ago)

Author:

vboxsync

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

48579

Message:

IPRT: Wrote the body for tstRTMemPool and fixed two isseus in mempool-generic.cpp: 1. messed up the linked list a little bit (as always). 2. don't assert on volatile pointers without owning the lock as someone else might change them while you're testing their validity and reading them multiple times.

File:

• trunk/src/VBox/Runtime/generic/mempool-generic.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/generic/mempool-generic.cpp

@@ -109 +109 @@
         AssertPtrReturn(pEntry, (rc)); \
         AssertPtrNullReturn((pEntry)->pMemPool, (rc)); \
+        Assert((pEntry)->cRefs < UINT32_MAX / 2); \
         AssertReturn((pEntry)->pMemPool->u32Magic == RTMEMPOOL_MAGIC, (rc)); \
-        AssertPtrNull((pEntry)->pNext); \
-        AssertPtrNull((pEntry)->pPrev); \
     } while (0)
 
@@ -179 +178 @@
     {
         PRTMEMPOOLENTRY pFree = pEntry;
+        Assert(pFree->cRefs > 0 && pFree->cRefs < UINT32_MAX / 2);
         pEntry = pEntry->pNext;
 
@@ -210 +210 @@
         if (pHead)
             pHead->pPrev = pEntry;
-        else
-            pMemPool->pHead = pEntry;
+        pMemPool->pHead = pEntry;
 
         RTSpinlockRelease(pMemPool->hSpinLock, &Tmp);
@@ -228 +227 @@
         RTSpinlockAcquire(pMemPool->hSpinLock, &Tmp);
 
-        if (pEntry->pNext)
-            pEntry->pNext->pPrev = pEntry->pPrev;
-        if (pEntry->pPrev)
-            pEntry->pPrev->pNext = pEntry->pNext;
+        PRTMEMPOOLENTRY pNext = pEntry->pNext;
+        PRTMEMPOOLENTRY pPrev = pEntry->pPrev;
+        if (pNext)
+            pNext->pPrev    = pPrev;
+        if (pPrev)
+            pPrev->pNext    = pNext;
         else
-            pMemPool->pHead      = pEntry->pNext;
+            pMemPool->pHead = pNext;
         pEntry->pMemPool = NULL;