Changeset 39351 in vbox

Timestamp:

Nov 17, 2011 3:08:31 PM (13 years ago)

Author:

vboxsync

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

74933

Message:

Main-OVF: make really sure all data is processed before stopping the reading

File:

• trunk/src/VBox/Main/src-server/ApplianceImplIO.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplIO.cpp

@@ -1043 +1043 @@
     {
         rc = sha1ReadSyncCallback(pvUser, pvStorage, pInt->cbCurAll, 0,
-                                    (size_t)(uOffset - pInt->cbCurAll), 0);
+                                  (size_t)(uOffset - pInt->cbCurAll), 0);
         if (RT_FAILURE(rc))
             return rc;
+//        RTPrintf("Gap Read uOffset: %7lu cbRead: %7lu = %7lu\n", uOffset, cbRead, uOffset + cbRead);
     }
 
@@ -1055 +1056 @@
             break;
         size_t cbAvail = RTCircBufUsed(pInt->pCircBuf);
-        if (   cbAvail == 0
-            && pInt->fEOF)
+        if (    cbAvail == 0
+            &&  pInt->fEOF
+            && !RTCircBufIsWriting(pInt->pCircBuf))
         {
             break;
@@ -1099 +1101 @@
 
     /* Signal the thread to read more data in the mean time. */
-    if (   RT_SUCCESS(rc)
-        && RTCircBufFree(pInt->pCircBuf) >= (RTCircBufSize(pInt->pCircBuf) / 2))
+    if (    RT_SUCCESS(rc)
+        &&  RTCircBufFree(pInt->pCircBuf) >= (RTCircBufSize(pInt->pCircBuf) / 2))
         rc = sha1SignalManifestThread(pInt, STATUS_READ);