Changeset 100908 in vbox for trunk/src/VBox/Runtime/common/fs

Timestamp:

Aug 19, 2023 2:57:05 AM (18 months ago)

Author:

vboxsync

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

158845

Message:

IPRT,Storage,Puel: Changed the pfnRead and pfnWrite VFS methods and the RTVfsIoStrmSgRead, RTVfsIoStrmSgWrite, RTVfsFileSgRead and RTVfsFileSgWrite APIs to advance pSgBuf and respect the incoming position just like RTFileSgRead & RTFileSgWrite.

Location:

trunk/src/VBox/Runtime/common/fs

Files:

• extvfs.cpp (modified) (4 diffs)
• fatvfs.cpp (modified) (4 diffs)
• isomaker.cpp (modified) (2 diffs)
• isovfs.cpp (modified) (2 diffs)
• ntfsvfs.cpp (modified) (6 diffs)
• xfsvfs.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/fs/extvfs.cpp

@@ -1716 +1716 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) rtFsExtFile_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) rtFsExtFile_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PRTFSEXTFILE pThis = (PRTFSEXTFILE)pvThis;
@@ -1733 +1733 @@
         rc = rtFsExtInode_Read(pThis->pVol, pThis->pInode, (uint64_t)off, pSgBuf->paSegs[0].pvSeg, cbRead, NULL);
         if (RT_SUCCESS(rc))
+        {
             pThis->offFile = off + cbRead;
+            RTSgBufAdvance(pSgBuf, cbRead);
+        }
         Log6(("rtFsExtFile_Read: off=%#RX64 cbSeg=%#x -> %Rrc\n", off, pSgBuf->paSegs[0].cbSeg, rc));
     }
@@ -1760 +1763 @@
                 pThis->offFile = off + cbRead;
                 *pcbRead = cbRead;
+                RTSgBufAdvance(pSgBuf, cbRead);
             }
             else
@@ -1774 +1778 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnWrite}
  */
-static DECLCALLBACK(int) rtFsExtFile_Write(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+static DECLCALLBACK(int) rtFsExtFile_Write(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
 {
     RT_NOREF(pvThis, off, pSgBuf, fBlocking, pcbWritten);

trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

@@ -2165 +2165 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) rtFsFatFile_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) rtFsFatFile_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PRTFSFATFILE     pThis   = (PRTFSFATFILE)pvThis;
@@ -2230 +2230 @@
     if (pcbRead)
         *pcbRead = cbRead;
+    RTSgBufAdvance(pSgBuf, cbRead);
     return rc;
 }
@@ -2327 +2328 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnWrite}
  */
-static DECLCALLBACK(int) rtFsFatFile_Write(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+static DECLCALLBACK(int) rtFsFatFile_Write(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
 {
     PRTFSFATFILE     pThis   = (PRTFSFATFILE)pvThis;
@@ -2401 +2402 @@
     if (pcbWritten)
         *pcbWritten = cbWritten;
+    RTSgBufAdvance(pSgBuf, cbWritten);
     return rc;
 }

trunk/src/VBox/Runtime/common/fs/isomaker.cpp

@@ -7280 +7280 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) rtFsIsoMakerOutFile_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) rtFsIsoMakerOutFile_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PRTFSISOMAKEROUTPUTFILE pThis     = (PRTFSISOMAKEROUTPUTFILE)pvThis;
@@ -7396 +7396 @@
     if (pcbRead)
         *pcbRead = cbRead;
+    RTSgBufAdvance(pSgBuf, cbRead);
     return rc;
 }

trunk/src/VBox/Runtime/common/fs/isovfs.cpp

@@ -2119 +2119 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) rtFsIsoFile_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) rtFsIsoFile_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PRTFSISOFILEOBJ  pThis   = (PRTFSISOFILEOBJ)pvThis;
@@ -2140 +2140 @@
     /* Update the file position and return. */
     pThis->offFile = off + offDelta;
+    RTSgBufAdvance(pSgBuf, offDelta);
+
     return rc;
 #else

trunk/src/VBox/Runtime/common/fs/ntfsvfs.cpp

@@ -2374 +2374 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) rtFsNtfsFile_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) rtFsNtfsFile_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PRTFSNTFSFILE pThis = (PRTFSNTFSFILE)pvThis;
@@ -2391 +2391 @@
         rc = rtFsNtfsAttr_Read(pThis->pShared->pData, off, pSgBuf->paSegs[0].pvSeg, cbRead);
         if (RT_SUCCESS(rc))
+        {
             pThis->offFile = off + cbRead;
+            RTSgBufAdvance(pSgBuf, cbRead);
+        }
         Log6(("rtFsNtfsFile_Read: off=%#RX64 cbSeg=%#x -> %Rrc\n", off, pSgBuf->paSegs[0].cbSeg, rc));
     }
@@ -2418 +2421 @@
                 pThis->offFile = off + cbRead;
                 *pcbRead = cbRead;
+                RTSgBufAdvance(pSgBuf, cbRead);
             }
             else
@@ -2432 +2436 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnWrite}
  */
-static DECLCALLBACK(int) rtFsNtfsFile_Write(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+static DECLCALLBACK(int) rtFsNtfsFile_Write(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
 {
     PRTFSNTFSFILE pThis = (PRTFSNTFSFILE)pvThis;
@@ -2451 +2455 @@
         Log6(("rtFsNtfsFile_Write: off=%#RX64 cbToWrite=%#zx -> %Rrc\n", off, cbToWrite, rc));
         if (RT_SUCCESS(rc))
+        {
             pThis->offFile = off + cbToWrite;
+            RTSgBufAdvance(pSgBuf, cbToWrite);
+        }
         if (pcbWritten)
             *pcbWritten = RT_SUCCESS(rc) ? cbToWrite : 0;
@@ -2466 +2473 @@
             if (pcbWritten)
                 *pcbWritten = cbWritten;
+            RTSgBufAdvance(pSgBuf, cbWritten);
             rc = VERR_EOF;
         }

trunk/src/VBox/Runtime/common/fs/xfsvfs.cpp

@@ -1474 +1474 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) rtFsXfsFile_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) rtFsXfsFile_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PRTFSXFSFILE pThis = (PRTFSXFSFILE)pvThis;
@@ -1491 +1491 @@
         rc = rtFsXfsInode_Read(pThis->pVol, pThis->pInode, (uint64_t)off, pSgBuf->paSegs[0].pvSeg, cbRead, NULL);
         if (RT_SUCCESS(rc))
+        {
             pThis->offFile = off + cbRead;
+            RTSgBufAdvance(pSgBuf, cbRead);
+        }
         Log6(("rtFsXfsFile_Read: off=%#RX64 cbSeg=%#x -> %Rrc\n", off, pSgBuf->paSegs[0].cbSeg, rc));
     }
@@ -1518 +1521 @@
                 pThis->offFile = off + cbRead;
                 *pcbRead = cbRead;
+                RTSgBufAdvance(pSgBuf, cbRead);
             }
             else
@@ -1532 +1536 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnWrite}
  */
-static DECLCALLBACK(int) rtFsXfsFile_Write(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+static DECLCALLBACK(int) rtFsXfsFile_Write(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
 {
     RT_NOREF(pvThis, off, pSgBuf, fBlocking, pcbWritten);