Changeset 100908 in vbox for trunk/src/VBox/Storage

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/Storage

Files:

• VDIfVfs.cpp (modified) (5 diffs)
• VDVfs.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/VDIfVfs.cpp

@@ -95 +95 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) vdIfVfsIos_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) vdIfVfsIos_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PVDIFVFSIOSFILE pThis = (PVDIFVFSIOSFILE)pvThis;
     Assert(pSgBuf->cSegs == 1); NOREF(fBlocking);
     Assert(off >= -1);
+
+    size_t       cbSeg = 0;
+    void * const pvSeg = RTSgBufGetCurrentSegment(pSgBuf, ~(size_t)0, &cbSeg);
 
     /*
@@ -108 +111 @@
     int rc;
     if (pThis->pVDIfsIo)
-        rc = vdIfIoFileReadSync(pThis->pVDIfsIo, pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbRead);
+        rc = vdIfIoFileReadSync(pThis->pVDIfsIo, pThis->pStorage, off, pvSeg, cbSeg, pcbRead);
     else
     {
-        rc = vdIfIoIntFileReadSync(pThis->pVDIfsIoInt, (PVDIOSTORAGE)pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg);
+        rc = vdIfIoIntFileReadSync(pThis->pVDIfsIoInt, (PVDIOSTORAGE)pThis->pStorage, off, pvSeg, cbSeg);
         if (pcbRead)
-            *pcbRead = RT_SUCCESS(rc) ? pSgBuf->paSegs[0].cbSeg : 0;
+            *pcbRead = RT_SUCCESS(rc) ? cbSeg : 0;
     }
     if (RT_SUCCESS(rc))
     {
-        size_t cbAdvance = pcbRead ? *pcbRead : pSgBuf->paSegs[0].cbSeg;
+        size_t const cbAdvance = pcbRead ? *pcbRead : cbSeg;
         pThis->offCurPos = off + cbAdvance;
+        RTSgBufAdvance(pSgBuf, cbAdvance);
         if (pcbRead && !cbAdvance)
             rc = VINF_EOF;
@@ -129 +133 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnWrite}
  */
-static DECLCALLBACK(int) vdIfVfsIos_Write(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+static DECLCALLBACK(int) vdIfVfsIos_Write(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
 {
     PVDIFVFSIOSFILE pThis = (PVDIFVFSIOSFILE)pvThis;
@@ -135 +139 @@
     Assert(off >= -1);
 
+    size_t             cbSeg = 0;
+    void const * const pvSeg = RTSgBufGetCurrentSegment(pSgBuf, ~(size_t)0, &cbSeg);
+
     /*
-     * This may end up being a little more complicated, esp. wrt VERR_EOF.
+     * Do the writing.
      */
     if (off == -1)
@@ -142 +149 @@
     int rc;
     if (pThis->pVDIfsIo)
-        rc = vdIfIoFileWriteSync(pThis->pVDIfsIo, pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbWritten);
+        rc = vdIfIoFileWriteSync(pThis->pVDIfsIo, pThis->pStorage, off, pvSeg, cbSeg, pcbWritten);
     else
     {
-        rc = vdIfIoIntFileWriteSync(pThis->pVDIfsIoInt, pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg);
+        rc = vdIfIoIntFileWriteSync(pThis->pVDIfsIoInt, pThis->pStorage, off, pvSeg, cbSeg);
         if (pcbWritten)
-            *pcbWritten = RT_SUCCESS(rc) ? pSgBuf->paSegs[0].cbSeg : 0;
+            *pcbWritten = RT_SUCCESS(rc) ? cbSeg : 0;
     }
     if (RT_SUCCESS(rc))
-        pThis->offCurPos = off + (pcbWritten ? *pcbWritten : pSgBuf->paSegs[0].cbSeg);
+    {
+        size_t const cbAdvance = pcbWritten ? *pcbWritten : cbSeg;
+        pThis->offCurPos = off + cbAdvance;
+        RTSgBufAdvance(pSgBuf, cbAdvance);
+    }
     return rc;
 }

trunk/src/VBox/Storage/VDVfs.cpp

@@ -341 +341 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) vdVfsFile_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
-{
-    PVDVFSFILE pThis = (PVDVFSFILE)pvThis;
+static DECLCALLBACK(int) vdVfsFile_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+{
+    PVDVFSFILE const pThis = (PVDVFSFILE)pvThis;
 
     Assert(pSgBuf->cSegs == 1);
@@ -364 +364 @@
     }
 
-    int rc = VINF_SUCCESS;
-    size_t cbLeftToRead = pSgBuf->paSegs[0].cbSeg;
-    if (offUnsigned + cbLeftToRead <= cbImage)
-    {
-        if (pcbRead)
-            *pcbRead = cbLeftToRead;
+    size_t       cbSeg = 0;
+    void * const pvSeg = RTSgBufGetCurrentSegment(pSgBuf, ~(size_t)0, &cbSeg);
+
+    int    rcRet = VINF_SUCCESS;
+    size_t cbToRead;
+    if (cbSeg <= cbImage - offUnsigned)
+        cbToRead = cbSeg;
+    else if (pcbRead)
+    {
+        cbToRead = (size_t)(cbImage - offUnsigned);
+        rcRet = VINF_EOF;
     }
     else
-    {
-        if (!pcbRead)
-            return VERR_EOF;
-        *pcbRead = cbLeftToRead = (size_t)(cbImage - offUnsigned);
-        rc = VINF_EOF;
-    }
+        return VERR_EOF;
 
     /*
      * Ok, we've got a valid stretch within the file.  Do the reading.
      */
-    if (cbLeftToRead > 0)
-    {
-        int rc2 = vdReadHelper(pThis->pDisk, offUnsigned, pSgBuf->paSegs[0].pvSeg, cbLeftToRead);
+    if (cbToRead > 0)
+    {
+        int rc2 = vdReadHelper(pThis->pDisk, offUnsigned, pvSeg, cbToRead);
         if (RT_SUCCESS(rc2))
-            offUnsigned += cbLeftToRead;
+        {
+            offUnsigned += cbToRead;
+            RTSgBufAdvance(pSgBuf, cbToRead);
+        }
         else
-            rc = rc2;
+        {
+            cbToRead = 0;
+            rcRet = rc2;
+        }
     }
 
     pThis->offCurPos = offUnsigned;
-    return rc;
+    if (pcbRead)
+        *pcbRead = cbToRead;
+    return rcRet;
 }
 
@@ -399 +407 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnWrite}
  */
-static DECLCALLBACK(int) vdVfsFile_Write(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
-{
-    PVDVFSFILE pThis = (PVDVFSFILE)pvThis;
+static DECLCALLBACK(int) vdVfsFile_Write(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+{
+    PVDVFSFILE const pThis = (PVDVFSFILE)pvThis;
 
     Assert(pSgBuf->cSegs == 1);
@@ -422 +430 @@
     }
 
-    size_t cbLeftToWrite;
-    if (offUnsigned + pSgBuf->paSegs[0].cbSeg <= cbImage)
-    {
-        cbLeftToWrite = pSgBuf->paSegs[0].cbSeg;
-        if (pcbWritten)
-            *pcbWritten = cbLeftToWrite;
-    }
+    size_t             cbSeg = 0;
+    void const * const pvSeg = RTSgBufGetCurrentSegment(pSgBuf, ~(size_t)0, &cbSeg);
+
+    size_t cbToWrite;
+    if (cbSeg <= cbImage - offUnsigned)
+        cbToWrite = cbSeg;
+    else if (pcbWritten)
+        cbToWrite = (size_t)(cbImage - offUnsigned);
     else
-    {
-        if (!pcbWritten)
-            return VERR_EOF;
-        *pcbWritten = cbLeftToWrite = (size_t)(cbImage - offUnsigned);
-    }
+        return VERR_EOF;
 
     /*
@@ -440 +445 @@
      */
     int rc = VINF_SUCCESS;
-    if (cbLeftToWrite > 0)
-    {
-        rc = vdWriteHelper(pThis->pDisk, offUnsigned, pSgBuf->paSegs[0].pvSeg, cbLeftToWrite);
+    if (cbToWrite > 0)
+    {
+        rc = vdWriteHelper(pThis->pDisk, offUnsigned, pvSeg, cbToWrite);
         if (RT_SUCCESS(rc))
-            offUnsigned += cbLeftToWrite;
+        {
+            offUnsigned += cbToWrite;
+            RTSgBufAdvance(pSgBuf, cbToWrite);
+        }
+        else
+            cbToWrite = 0;
     }
 
     pThis->offCurPos = offUnsigned;
+    if (pcbWritten)
+        *pcbWritten = cbToWrite;
     return rc;
 }