Changeset 59827 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

Feb 25, 2016 9:04:12 PM (9 years ago)

Author:

vboxsync

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

105720

Message:

vfsreadahead.cpp: Fixed two bugs in the read code and increased the buffer size.

File:

• trunk/src/VBox/Runtime/common/vfs/vfsreadahead.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsreadahead.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_VFS
 #include "internal/iprt.h"
 #include <iprt/vfs.h>
@@ -37 +38 @@
 #include <iprt/file.h>
 #include <iprt/list.h>
+#include <iprt/log.h>
 #include <iprt/poll.h>
 #include <iprt/string.h>
@@ -277 +279 @@
         {
             rc = pcbRead ? VINF_EOF : VERR_EOF;
+            Log(("rtVfsReadAhead_Read: ret %Rrc; offCur=%#llx offEof=%#llx\n", rc, offCur, pThis->offEof));
             break;
         }
@@ -308 +311 @@
         RTSgBufInit(&TmpSgBuf, &TmpSeg, 1);
         size_t cbThisRead = cbDst;
-        rc = RTVfsIoStrmSgRead(pThis->hIos, off, pSgBuf, fBlocking, pcbRead ? &cbThisRead : NULL);
+        rc = RTVfsIoStrmSgRead(pThis->hIos, off, &TmpSgBuf, fBlocking, pcbRead ? &cbThisRead : NULL);
         if (RT_SUCCESS(rc))
         {
-            cbTotalRead = cbThisRead;
-            offCur     += cbThisRead;
+            cbTotalRead += cbThisRead;
+            offCur      += cbThisRead;
             pThis->offConsumer = offCur;
             if (rc != VINF_EOF)
                 fPokeReader = true;
             else
+            {
                 pThis->offEof = offCur;
+                Log(("rtVfsReadAhead_Read: EOF %llu (%#llx)\n", pThis->offEof, pThis->offEof));
+            }
         }
         /* else if (rc == VERR_EOF): hard to say where exactly the current position
@@ -331 +337 @@
     if (pcbRead)
         *pcbRead = cbTotalRead;
+    Assert(cbTotalRead <= pSgBuf->paSegs[0].cbSeg);
 
     return rc;
@@ -583 +590 @@
                 {
                     if (rc == VINF_EOF)
+                    {
                         pThis->offEof = pBufDesc->off + cbRead;
+                        Log(("rtVfsReadAheadThreadProc: EOF %llu (%#llx)\n", pThis->offEof, pThis->offEof));
+                    }
                     pBufDesc->cbFilled = (uint32_t)cbRead;
 
@@ -669 +679 @@
     if (cBuffers == 0)
         cBuffers = 4;
-    AssertStmt(cbBuffer <= _512K, rc = VERR_OUT_OF_RANGE);
+    AssertStmt(cbBuffer <= _4M, rc = VERR_OUT_OF_RANGE);
     if (cbBuffer == 0)
         cbBuffer = _256K / cBuffers;
+    AssertStmt(cbBuffer * cBuffers < (ARCH_BITS < 64 ? _64M : _256M), rc = VERR_OUT_OF_RANGE);
     AssertStmt(!fFlags, rc = VERR_INVALID_FLAGS);