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

Timestamp:

Mar 19, 2010 11:22:40 AM (15 years ago)

Author:

vboxsync

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

59029

Message:

I/O cache: We have to clip the read size if there is an intersecting entry in the cache

File:

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

trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp

@@ -1873 +1873 @@
             }
             else
-#endif
             {
                 /*
@@ -1879 +1878 @@
                  * Pass the request directly to the I/O manager.
                  */
-                //LogFlow(("Couldn't evict %u bytes from the cache. Remaining request will be passed through\n", cbToRead));
+                LogFlow(("Couldn't evict %u bytes from the cache. Remaining request will be passed through\n", cbToRead));
 
                 pdmacFileEpCacheRequestPassthrough(pEndpoint, pTask,
@@ -1885 +1884 @@
                                                    PDMACTASKFILETRANSFER_READ);
             }
+#else
+            /* Clip read size if neccessary. */
+            PPDMACFILECACHEENTRY pEntryAbove;
+            pdmacFileEpCacheGetCacheBestFitEntryByOffset(pEndpointCache, off,
+                                                         &pEntryAbove, NULL);
+
+            if (pEntryAbove)
+            {
+                if (off + (RTFOFF)cbRead > pEntryAbove->Core.Key)
+                    cbToRead = pEntryAbove->Core.Key - off;
+                else
+                    cbToRead = cbRead;
+
+                pdmacFileEpCacheEntryRelease(pEntryAbove);
+            }
+
+            cbRead -= cbToRead;
+            pdmacFileEpCacheRequestPassthrough(pEndpoint, pTask,
+                                                &IoMemCtx, off, cbToRead,
+                                                PDMACTASKFILETRANSFER_READ);
+#endif
         }
         off += cbToRead;