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

Timestamp:

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

Author:

vboxsync

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.

File:

• trunk/src/VBox/Runtime/common/checksum/manifest3.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/common/checksum/manifest3.cpp

@@ -306 +306 @@
  *
  * @param   pThis               The passthru I/O stream instance data.
- * @param   pSgBuf              The scather/gather buffer.
+ * @param   pSgBuf              The scather/gather buffer (clone, can be
+ *                              updated).
  * @param   cbLeft              The number of bytes to take from the buffer.
  */
-static void rtManifestPtIos_UpdateHashes(PRTMANIFESTPTIOS pThis, PCRTSGBUF pSgBuf, size_t cbLeft)
-{
-    for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
-    {
-        size_t cbSeg = pSgBuf->paSegs[iSeg].cbSeg;
-        if (cbSeg > cbLeft)
-            cbSeg = cbLeft;
-        rtManifestHashesUpdate(pThis->pHashes, pSgBuf->paSegs[iSeg].pvSeg, cbSeg);
+static void rtManifestPtIos_UpdateHashes(PRTMANIFESTPTIOS pThis, PRTSGBUF pSgBuf, size_t cbLeft)
+{
+    while (cbLeft > 0)
+    {
+        Assert(!RTSgBufIsAtEnd(pSgBuf));
+        size_t             cbSeg = cbLeft;
+        void const * const pvSeg = RTSgBufGetNextSegment(pSgBuf, &cbSeg);
+        rtManifestHashesUpdate(pThis->pHashes, pvSeg, cbSeg);
         cbLeft -= cbSeg;
-        if (!cbLeft)
-            break;
     }
 }
@@ -326 +325 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnRead}
  */
-static DECLCALLBACK(int) rtManifestPtIos_Read(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+static DECLCALLBACK(int) rtManifestPtIos_Read(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
 {
     PRTMANIFESTPTIOS pThis = (PRTMANIFESTPTIOS)pvThis;
@@ -332 +331 @@
 
     /*
+     * Clone the buffer for the manifest pass.
+     */
+    RTSGBUF CloneSgBuf;
+    RTSgBufClone(&CloneSgBuf, pSgBuf);
+
+    /*
      * To make sure we're continuing where we left off, we must have the exact
      * stream position since a previous read using 'off' may change it.
@@ -338 +343 @@
     if (offActual == pThis->offCurPos)
     {
+        size_t const cbReq = RTSgBufCalcLengthLeft(pSgBuf);
         rc = RTVfsIoStrmSgRead(pThis->hVfsIos, off, pSgBuf, fBlocking, pcbRead);
         if (RT_SUCCESS(rc))
         {
-            rtManifestPtIos_UpdateHashes(pThis, pSgBuf, pcbRead ? *pcbRead : ~(size_t)0);
-            if (!pcbRead)
-                for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
-                    pThis->offCurPos += pSgBuf->paSegs[iSeg].cbSeg;
-            else
-                pThis->offCurPos += *pcbRead;
+            rtManifestPtIos_UpdateHashes(pThis, &CloneSgBuf, pcbRead ? *pcbRead : cbReq);
+            pThis->offCurPos += pcbRead ? *pcbRead : cbReq;
         }
         Assert(RTVfsIoStrmTell(pThis->hVfsIos) == pThis->offCurPos);
@@ -390 +392 @@
         {
             /* See if there is anything to update the hash with. */
-            size_t cbLeft = pcbRead ? *pcbRead : ~(size_t)0;
-            for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
+            size_t cbLeft = pcbRead ? *pcbRead : RTSgBufCalcLengthLeft(&CloneSgBuf);
+            while (cbLeft > 0)
             {
-                size_t cbThis = pSgBuf->paSegs[iSeg].cbSeg;
-                if (cbThis > cbLeft)
-                    cbThis = cbLeft;
+                Assert(!RTSgBufIsAtEnd(&CloneSgBuf));
+                size_t         cbSeg = cbLeft;
+                const uint8_t *pbSeg = (uint8_t const *)RTSgBufGetNextSegment(&CloneSgBuf, &cbSeg);
 
                 if (   offActual >= pThis->offCurPos
-                    && pThis->offCurPos < offActual + (ssize_t)cbThis)
+                    && pThis->offCurPos < offActual + (ssize_t)cbSeg)
                 {
                     size_t offSeg = (size_t)(offActual - pThis->offCurPos);
-                    rtManifestHashesUpdate(pThis->pHashes, (uint8_t *)pSgBuf->paSegs[iSeg].pvSeg + offSeg, cbThis - offSeg);
-                    pThis->offCurPos += cbThis - offSeg;
+                    rtManifestHashesUpdate(pThis->pHashes, &pbSeg[offSeg], cbSeg - offSeg);
+                    pThis->offCurPos += cbSeg - offSeg;
                 }
 
-                cbLeft -= cbThis;
-                if (!cbLeft)
-                    break;
-                offActual += cbThis;
+                cbLeft -= cbSeg;
             }
         }
@@ -419 +418 @@
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnWrite}
  */
-static DECLCALLBACK(int) rtManifestPtIos_Write(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+static DECLCALLBACK(int) rtManifestPtIos_Write(void *pvThis, RTFOFF off, PRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
 {
     PRTMANIFESTPTIOS pThis = (PRTMANIFESTPTIOS)pvThis;
@@ -454 +453 @@
 
     /*
+     * Clone the buffer for the manifest pass.
+     */
+    RTSGBUF CloneSgBuf;
+    RTSgBufClone(&CloneSgBuf, pSgBuf);
+    size_t const cbReq = RTSgBufCalcLengthLeft(pSgBuf);
+
+    /*
      * Do the writing.
      */
@@ -459 +465 @@
     if (RT_SUCCESS(rc))
     {
-        rtManifestPtIos_UpdateHashes(pThis, pSgBuf, pcbWritten ? *pcbWritten : ~(size_t)0);
-        if (!pcbWritten)
-            for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
-                pThis->offCurPos += pSgBuf->paSegs[iSeg].cbSeg;
-        else
-            pThis->offCurPos += *pcbWritten;
+        rtManifestPtIos_UpdateHashes(pThis, &CloneSgBuf, pcbWritten ? *pcbWritten : cbReq);
+        pThis->offCurPos += pcbWritten ? *pcbWritten : cbReq;
     }
     return rc;