Changeset 25271 in vbox

Timestamp:

Dec 9, 2009 2:55:54 PM (15 years ago)

Author:

vboxsync

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

55808

Message:

PDMAsyncCompletionFileCache.cpp: warnings and don't release pEntryBestFit until after using it.

File:

• trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp

@@ -992 +992 @@
 
     RTSemRWRequestRead(pEndpointCache->SemRWEntries, RT_INDEFINITE_WAIT);
-    pEntry = (PPDMACFILECACHEENTRY)RTAvlrFileOffsetGetBestFit(pEndpointCache->pTree, off, true);
+    pEntry = (PPDMACFILECACHEENTRY)RTAvlrFileOffsetGetBestFit(pEndpointCache->pTree, off, true /*fAbove*/);
     if (pEntry)
         pdmacFileEpCacheEntryRef(pEntry);
@@ -1025 +1025 @@
  * @param   pbBuffer  Pointer to the buffer to use.
  *                    NULL if a new buffer should be allocated.
- *                    The buffer needs to have the same size of the entry. 
+ *                    The buffer needs to have the same size of the entry.
  */
 static PPDMACFILECACHEENTRY pdmacFileCacheEntryAlloc(PPDMACFILECACHEGLOBAL pCache,
@@ -1313 +1313 @@
                 /* Move the entry to Am and fetch it to the cache. */
                 pdmacFileCacheEntryAddToList(&pCache->LruFrequentlyUsed, pEntry);
-                RTCritSectLeave(&pCache->CritSect);                
+                RTCritSectLeave(&pCache->CritSect);
 #else
                 RTCritSectEnter(&pCache->CritSect);
@@ -1369 +1369 @@
                      pEntryBestFit ? pEntryBestFit->cbData : 0));
 
-            if (pEntryBestFit && ((off + (RTFOFF)cbRead) > pEntryBestFit->Core.Key))
+            if (    pEntryBestFit
+                &&  off + (RTFOFF)cbRead > pEntryBestFit->Core.Key)
             {
                 cbToRead = pEntryBestFit->Core.Key - off;
@@ -1377 +1378 @@
             else
             {
-                 if (pEntryBestFit)
-                    pdmacFileEpCacheEntryRelease(pEntryBestFit);
-
                 /*
                  * Align the size to a 4KB boundary.
@@ -1386 +1384 @@
                  * (For example reads with a size of 512 bytes.
                  */
-                cbToRead = cbRead; 
+                cbToRead = cbRead;
                 cbToReadAligned = RT_ALIGN_Z(cbRead, PAGE_SIZE);
 
@@ -1392 +1390 @@
                 cbToReadAligned = RT_MIN(pEndpoint->cbFile - off, cbToReadAligned);
                 if (pEntryBestFit)
-                    cbToReadAligned = RT_MIN(cbToReadAligned, pEntryBestFit->Core.Key - off);
+                {
+                    Assert(pEntryBestFit->Core.Key >= off);
+                    cbToReadAligned = RT_MIN(cbToReadAligned, (uint64_t)pEntryBestFit->Core.Key - off);
+                    pdmacFileEpCacheEntryRelease(pEntryBestFit);
+                }
             }
 
@@ -1753 +1755 @@
                 /* Move the entry to Am and fetch it to the cache. */
                 pdmacFileCacheEntryAddToList(&pCache->LruFrequentlyUsed, pEntry);
-                RTCritSectLeave(&pCache->CritSect);                
+                RTCritSectLeave(&pCache->CritSect);
 #else
                 RTCritSectEnter(&pCache->CritSect);