Changeset 59729 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Feb 19, 2016 12:31:35 AM (9 years ago)

Author:

vboxsync

Message:

didn't mean to enable building common/vfs/vfsreadahead.cpp yet.

File:

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

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

@@ -52 +52 @@
 #include <iprt/err.h>
 #include <iprt/mem.h>
-#include <iprt/sempahore.h>
 #include <iprt/thread.h>
-
-
-/*********************************************************************************************************************************
-*   Defined Constants And Macros                                                                                                 *
-*********************************************************************************************************************************/
 
 
@@ -79 +73 @@
     uint32_t volatile   fReserved;
     /** Pointer to the buffer. */
-    uint8_t            *pbBuffer
+    uint8_t            *pbBuffer;
 } RTVFSREADAHEADBUFDESC;
 /** Pointer to a memory file extent. */
@@ -163 +157 @@
     RTVfsIoStrmRelease(pThis->hIos);
     pThis->hIos  = NIL_RTVFSIOSTREAM;
-    RTVfsFileRelase(pThis->hFile);
+    RTVfsFileRelease(pThis->hFile);
     pThis->hFile = NIL_RTVFSFILE;
 
@@ -195 +189 @@
 {
     PRTVFSREADAHEAD pThis = (PRTVFSREADAHEAD)pvThis;
-    return RTVfsIoStrmQueryInfo(pThis->hVfs, pObjInfo, enmAddAttr);
+    return RTVfsIoStrmQueryInfo(pThis->hIos, pObjInfo, enmAddAttr);
 }
 
@@ -215 +209 @@
      * section, just in case a buffer got inserted while we were waiting for it.
      */
-    int    rc;
+    int    rc = VINF_SUCCESS;
     size_t cbTotalRead     = 0;
     bool   fPokeReader     = false;
@@ -232 +226 @@
         }
 
-        RTListForEach(&pThis->ConsumerList, pCurBufDesc, Type, ListEntry)
+        PRTVFSREADAHEADBUFDESC pCurBufDesc;
+        RTListForEach(&pThis->ConsumerList, pCurBufDesc, RTVFSREADAHEADBUFDESC, ListEntry)
         {
             if (pThis->offConsumer)
@@ -258 +253 @@
          * Do a direct read of the remaining data.
          */
-        size_t cbDirectRead;
+        //size_t cbDirectRead;
 
 
@@ -307 +302 @@
         return VERR_NOT_IMPLEMENTED;
     }
-    return RTVfsIoStrmPoll(pThis->hVfs, fEvents, cMillies, fIntr, pfRetEvents);
+    return RTVfsIoStrmPoll(pThis->hIos, fEvents, cMillies, fIntr, pfRetEvents);
 }
 
@@ -534 +529 @@
                     {
                         do
-                            pAfter = RTListGetPrev(&pThis->ConsumerList, &pAfter->ListEntry, RTVFSREADAHEADBUFDESC, ListEntry);
+                            pAfter = RTListGetPrev(&pThis->ConsumerList, pAfter, RTVFSREADAHEADBUFDESC, ListEntry);
                         while (pAfter && pAfter->off > pBufDesc->off);
                         if (!pAfter)
@@ -580 +575 @@
      */
     int rc = VINF_SUCCESS;
-    AssertStmt(cBuffers < _8K, rc = VERR_OUT_OF_RANGE);
+    AssertStmt(cBuffers < _4K, rc = VERR_OUT_OF_RANGE);
     if (cBuffers == 0)
         cBuffers = 4;
-    AssertStmt(cbBuffer < , rc = VERR_OUT_OF_RANGE);
+    AssertStmt(cbBuffer <= _512K, rc = VERR_OUT_OF_RANGE);
     if (cbBuffer == 0)
         cbBuffer = _256K / cBuffers;
@@ -597 +592 @@
         PRTVFSREADAHEAD pThis;
         size_t          cbThis = RT_OFFSETOF(RTVFSREADAHEAD, aBufDescs[cBuffers]);
-        if (hVfsFile != NIL_RTVFSFILE)
+        if (hVfsFileSrc != NIL_RTVFSFILE)
             rc = RTVfsNewFile(&g_VfsReadAheadFileOps, cbThis, RTFILE_O_READ, NIL_RTVFS, NIL_RTVFSLOCK,
                               &hVfsFileReadAhead, (void **)&pThis);
@@ -615 +610 @@
             pThis->cbBuffer         = cbBuffer;
             pThis->offConsumer      = RTVfsIoStrmTell(hVfsIosSrc);
-            pThis->offActual        = pThis->offConsumer;
             if ((RTFOFF)pThis->offConsumer >= 0)
             {
-                rc = RTCritSectInit(&pThis->BufferCritSect);
+                rc = RTCritSectInit(&pThis->IoCritSect);
                 if (RT_SUCCESS(rc))
-                    rc = RTCritSectInit(&pThis->ConsumerList);
+                    rc = RTCritSectInit(&pThis->BufferCritSect);
                 if (RT_SUCCESS(rc))
                 {
-                    pThis->pbAllBuffers = RTMemPageAlloc(pThis->cbBuffer * pThis->cBuffers);
+                    pThis->pbAllBuffers = (uint8_t *)RTMemPageAlloc(pThis->cbBuffer * pThis->cBuffers);
                     if (pThis->pbAllBuffers)
                     {
@@ -646 +640 @@
                             if (phVfsFile)
                                 *phVfsFile = hVfsFileReadAhead;
-                            else if (hVfsFileReadAhead == NIL_RTFILE)
+                            else if (hVfsFileReadAhead == NIL_RTVFSFILE)
                                 *phVfsIos = hVfsIosReadAhead;
                             else
@@ -674 +668 @@
 {
     AssertPtrReturn(phVfsIos, VERR_INVALID_POINTER);
-    phVfsIos = NIL_RTVFSIOSTREAM;
+    *phVfsIos = NIL_RTVFSIOSTREAM;
 
     /*
@@ -684 +678 @@
     RTVFSFILE hVfsFile = RTVfsIoStrmToFile(hVfsIos);
 
-    return rtVfsCreateReadAheadInstance(hVfsIos, hVfsFile, fFlags, cBuffers, cbBuffer, phVfsIos);
+    /*
+     * Do the job. (This always consumes the above retained references.)
+     */
+    return rtVfsCreateReadAheadInstance(hVfsIos, hVfsFile, fFlags, cBuffers, cbBuffer, phVfsIos, NULL);
 }
 
@@ -691 +688 @@
                                         PRTVFSFILE phVfsFile)
 {
-    AssertPtrReturn(phVfsIos, VERR_INVALID_POINTER);
+    AssertPtrReturn(phVfsFile, VERR_INVALID_POINTER);
     *phVfsFile = NIL_RTVFSFILE;
 
@@ -699 +696 @@
     RTVFSIOSTREAM hVfsIos = RTVfsFileToIoStream(hVfsFile);
     AssertReturn(hVfsIos != NIL_RTVFSIOSTREAM, VERR_INVALID_HANDLE);
-    uint32_t cRefs = RTVfsFileRetain(hVfsIos);
+    uint32_t cRefs = RTVfsFileRetain(hVfsFile);
     AssertReturnStmt(cRefs != UINT32_MAX, RTVfsIoStrmRelease(hVfsIos), VERR_INVALID_HANDLE);
 
     /*
-     * Create a read ahead instance and cast it to a file before returning.
-     */
-    RTVFSIOSTREAM hVfsIosReadAhead;
-    int rc = rtVfsCreateReadAheadInstance(hVfsIos, hVfsFile, fFlags, cBuffers, cbBuffer, &hVfsIosReadAhead);
-    if (RT_SUCCESS(rc))
-    {
-        *phVfsFile = RTVfsIoStrmToFile(hVfsIosReadAhead);
-        RTVfsIoStrmRelease(hVfsIosReadAhead);
-        AssertReturn(*phVfsFile != NIL_RTVFSFILE, VERR_INTERNAL_ERROR_5);
-    }
-
-    return rc;
-}
-
+     * Do the job. (This always consumes the above retained references.)
+     */
+    return rtVfsCreateReadAheadInstance(hVfsIos, hVfsFile, fFlags, cBuffers, cbBuffer, NULL, phVfsFile);
+}
+