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

Timestamp:

Jun 22, 2011 7:30:06 PM (14 years ago)

Author:

vboxsync

Message:

*: RTFILE becomes a pointer, RTFileOpen++ expands it's flags paramter from uint32_t to uint64_t.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PDMAsyncCompletionFile.cpp (modified) (7 diffs)
• VMMR3/PDMAsyncCompletionFileFailsafe.cpp (modified) (3 diffs)
• VMMR3/PDMAsyncCompletionFileNormal.cpp (modified) (11 diffs)
• include/PDMAsyncCompletionFileInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp

@@ -1012 +1012 @@
          * contain dirty buffers.
          */
-        RTFILE File = NIL_RTFILE;
-
-        rc = RTFileOpen(&File, pszUri, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+        RTFILE hFile = NIL_RTFILE;
+
+        rc = RTFileOpen(&hFile, pszUri, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
         if (RT_SUCCESS(rc))
         {
             uint64_t cbSize;
 
-            rc = pdmacFileEpNativeGetSize(File, &cbSize);
+            rc = pdmacFileEpNativeGetSize(hFile, &cbSize);
             Assert(RT_FAILURE(rc) || cbSize != 0);
 
@@ -1034 +1034 @@
 #endif
             }
-            RTFileClose(File);
+            RTFileClose(hFile);
         }
     }
 
     /* Open with final flags. */
-    rc = RTFileOpen(&pEpFile->File, pszUri, fFileFlags);
+    rc = RTFileOpen(&pEpFile->hFile, pszUri, fFileFlags);
     if ((rc == VERR_INVALID_FUNCTION) || (rc == VERR_INVALID_PARAMETER))
     {
@@ -1064 +1064 @@
 
         /* Open again. */
-        rc = RTFileOpen(&pEpFile->File, pszUri, fFileFlags);
+        rc = RTFileOpen(&pEpFile->hFile, pszUri, fFileFlags);
 
         if (RT_FAILURE(rc))
@@ -1077 +1077 @@
         pEpFile->fFlags = fFileFlags;
 
-        rc = pdmacFileEpNativeGetSize(pEpFile->File, (uint64_t *)&pEpFile->cbFile);
+        rc = pdmacFileEpNativeGetSize(pEpFile->hFile, (uint64_t *)&pEpFile->cbFile);
         Assert(RT_FAILURE(rc) || pEpFile->cbFile != 0);
 
@@ -1147 +1147 @@
 
         if (RT_FAILURE(rc))
-            RTFileClose(pEpFile->File);
+            RTFileClose(pEpFile->hFile);
     }
 
@@ -1207 +1207 @@
     RTAvlrFileOffsetDestroy(pEpFile->AioMgr.pTreeRangesLocked, pdmacFileEpRangesLockedDestroy, NULL);
 
-    RTFileClose(pEpFile->File);
+    RTFileClose(pEpFile->hFile);
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1301 +1301 @@
 
     ASMAtomicWriteU64(&pEpFile->cbFile, cbSize);
-    return RTFileSetSize(pEpFile->File, cbSize);
+    return RTFileSetSize(pEpFile->hFile, cbSize);
 }
 

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp

@@ -78 +78 @@
             case PDMACTASKFILETRANSFER_FLUSH:
             {
-                rc = RTFileFlush(pEndpoint->File);
+                rc = RTFileFlush(pEndpoint->hFile);
                 break;
             }
@@ -86 +86 @@
                 if (pCurr->enmTransferType == PDMACTASKFILETRANSFER_READ)
                 {
-                    rc = RTFileReadAt(pEndpoint->File, pCurr->Off,
+                    rc = RTFileReadAt(pEndpoint->hFile, pCurr->Off,
                                       pCurr->DataSeg.pvSeg,
                                       pCurr->DataSeg.cbSeg,
@@ -96 +96 @@
                     {
                         ASMAtomicWriteU64(&pEndpoint->cbFile, pCurr->Off + pCurr->DataSeg.cbSeg);
-                        RTFileSetSize(pEndpoint->File, pCurr->Off + pCurr->DataSeg.cbSeg);
+                        RTFileSetSize(pEndpoint->hFile, pCurr->Off + pCurr->DataSeg.cbSeg);
                     }
 
-                    rc = RTFileWriteAt(pEndpoint->File, pCurr->Off,
+                    rc = RTFileWriteAt(pEndpoint->hFile, pCurr->Off,
                                        pCurr->DataSeg.pvSeg,
                                        pCurr->DataSeg.cbSeg,

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp

@@ -205 +205 @@
 
         /* Reopen the file so that the new endpoint can re-associate with the file */
-        RTFileClose(pEndpointRemove->File);
-        int rc = RTFileOpen(&pEndpointRemove->File, pEndpointRemove->Core.pszUri, pEndpointRemove->fFlags);
+        RTFileClose(pEndpointRemove->hFile);
+        int rc = RTFileOpen(&pEndpointRemove->hFile, pEndpointRemove->Core.pszUri, pEndpointRemove->fFlags);
         AssertRC(rc);
         return false;
@@ -341 +341 @@
     while (pCurr)
     {
-        RTFileClose(pCurr->File);
-        rc = RTFileOpen(&pCurr->File, pCurr->Core.pszUri, pCurr->fFlags);
+        RTFileClose(pCurr->hFile);
+        rc = RTFileOpen(&pCurr->hFile, pCurr->Core.pszUri, pCurr->fFlags);
         AssertRC(rc);
 
@@ -390 +390 @@
     while (pCurr)
     {
-        rc = RTFileAioCtxAssociateWithFile(pAioMgr->hAioCtx, pCurr->File);
+        rc = RTFileAioCtxAssociateWithFile(pAioMgr->hAioCtx, pCurr->hFile);
         AssertRC(rc);
 
@@ -790 +790 @@
             {
                 ASMAtomicWriteU64(&pEndpoint->cbFile, pTask->Off + pTask->DataSeg.cbSeg);
-                RTFileSetSize(pEndpoint->File, pTask->Off + pTask->DataSeg.cbSeg);
-            }
-
-            rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->File,
+                RTFileSetSize(pEndpoint->hFile, pTask->Off + pTask->DataSeg.cbSeg);
+            }
+
+            rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->hFile,
                                           pTask->Off, pTask->DataSeg.pvSeg,
                                           pTask->DataSeg.cbSeg, pTask);
         }
         else
-            rc = RTFileAioReqPrepareRead(hReq, pEndpoint->File,
+            rc = RTFileAioReqPrepareRead(hReq, pEndpoint->hFile,
                                          pTask->Off, pTask->DataSeg.pvSeg,
                                          pTask->DataSeg.cbSeg, pTask);
@@ -925 +925 @@
                 {
                     ASMAtomicWriteU64(&pEndpoint->cbFile, pTask->Off + pTask->DataSeg.cbSeg);
-                    RTFileSetSize(pEndpoint->File, pTask->Off + pTask->DataSeg.cbSeg);
-                }
-
-                rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->File,
+                    RTFileSetSize(pEndpoint->hFile, pTask->Off + pTask->DataSeg.cbSeg);
+                }
+
+                rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->hFile,
                                               offStart, pvBuf, cbToTransfer, pTask);
             }
             else
-                rc = RTFileAioReqPrepareRead(hReq, pEndpoint->File,
+                rc = RTFileAioReqPrepareRead(hReq, pEndpoint->hFile,
                                              offStart, pvBuf, cbToTransfer, pTask);
             AssertRC(rc);
@@ -1004 +1004 @@
                     LogFlow(("Flush request %#p\n", hReq));
 
-                    rc = RTFileAioReqPrepareFlush(hReq, pEndpoint->File, pCurr);
+                    rc = RTFileAioReqPrepareFlush(hReq, pEndpoint->hFile, pCurr);
                     if (RT_FAILURE(rc))
                     {
@@ -1189 +1189 @@
 
             /* Assign the completion point to this file. */
-            rc = RTFileAioCtxAssociateWithFile(pAioMgr->hAioCtx, pEndpointNew->File);
+            rc = RTFileAioCtxAssociateWithFile(pAioMgr->hAioCtx, pEndpointNew->hFile);
             fNotifyWaiter = true;
             pAioMgr->cEndpoints++;
@@ -1289 +1289 @@
         {
             /* Reopen the file so that the new endpoint can re-associate with the file */
-            RTFileClose(pEndpoint->File);
-            rc = RTFileOpen(&pEndpoint->File, pEndpoint->Core.pszUri, pEndpoint->fFlags);
+            RTFileClose(pEndpoint->hFile);
+            rc = RTFileOpen(&pEndpoint->hFile, pEndpoint->Core.pszUri, pEndpoint->fFlags);
             AssertRC(rc);
 
@@ -1472 +1472 @@
                 if (pTask->fPrefetch || pTask->enmTransferType == PDMACTASKFILETRANSFER_READ)
                 {
-                    rc = RTFileAioReqPrepareRead(hReq, pEndpoint->File, offStart,
+                    rc = RTFileAioReqPrepareRead(hReq, pEndpoint->hFile, offStart,
                                                  pbBuf, cbToTransfer, pTask);
                 }
@@ -1479 +1479 @@
                     AssertMsg(pTask->enmTransferType == PDMACTASKFILETRANSFER_WRITE,
                                   ("Invalid transfer type\n"));
-                    rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->File, offStart,
+                    rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->hFile, offStart,
                                                   pbBuf, cbToTransfer, pTask);
                 }
@@ -1507 +1507 @@
                 {
                     ASMAtomicWriteU64(&pEndpoint->cbFile, pTask->Off + pTask->DataSeg.cbSeg);
-                    RTFileSetSize(pEndpoint->File, pTask->Off + pTask->DataSeg.cbSeg);
-                }
-
-                rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->File,
+                    RTFileSetSize(pEndpoint->hFile, pTask->Off + pTask->DataSeg.cbSeg);
+                }
+
+                rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->hFile,
                                               offStart, pTask->pvBounceBuffer, cbToTransfer, pTask);
                 AssertRC(rc);

trunk/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h

@@ -327 +327 @@
     unsigned                               fFlags;
     /** File handle. */
-    RTFILE                                 File;
+    RTFILE                                 hFile;
     /**
      * Real size of the file. Only updated if