Changeset 26246 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 4, 2010 7:30:47 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Fix passthrough after cleanup, assertion and a locking error

File:

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

trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp

@@ -402 +402 @@
                 pCache->cbCached -= pCurr->cbData;
 
+                pdmacFileCacheEntryRemoveFromList(pCurr);
+
                 if (pGhostListDst)
                 {
+                    RTSemRWReleaseWrite(pEndpointCache->SemRWEntries);
 #ifdef VBOX_WITH_2Q_CACHE
                     /* We have to remove the last entries from the paged out list. */
@@ -433 +436 @@
                     STAM_PROFILE_ADV_STOP(&pCache->StatTreeRemove, Cache);
 
-                    pdmacFileCacheEntryRemoveFromList(pCurr);
+                    RTSemRWReleaseWrite(pEndpointCache->SemRWEntries);
                     RTMemFree(pCurr);
                 }
             }
-            RTSemRWReleaseWrite(pEndpointCache->SemRWEntries);
+
         }
         else
@@ -1413 +1416 @@
             cbToRead = RT_MIN(pEntry->cbData - OffDiff, cbRead);
 
-            AssertMsg(off + (RTFOFF)cbToRead <= pEntry->Core.Key + pEntry->Core.KeyLast,
-                      ("Buffer of cache entry exceeded off=%RTfoff cbToRead=%z\n",
+            AssertMsg(off + (RTFOFF)cbToRead <= pEntry->Core.Key + pEntry->Core.KeyLast + 1,
+                      ("Buffer of cache entry exceeded off=%RTfoff cbToRead=%d\n",
                        off, cbToRead));
 
@@ -1626 +1629 @@
                                                    &IoMemCtx, off, cbToRead,
                                                    PDMACTASKFILETRANSFER_READ);
+                off += cbToRead;
             }
         }
@@ -1956 +1960 @@
                                                    &IoMemCtx, off, cbToWrite,
                                                    PDMACTASKFILETRANSFER_WRITE);
+                off += cbToWrite;
             }
         }