From: Paul Cruz <paulcruz74@fb.com>
Date: Wed, 19 Jul 2017 16:59:17 +0000 (-0700)
Subject: split up read process into smaller chunks
X-Git-Tag: v1.3.1^2~13^2^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=559ea4ff25b3728024a55fdc9966925de2e116ba;p=thirdparty%2Fzstd.git

split up read process into smaller chunks
---

diff --git a/contrib/adaptive-compression/adapt.c b/contrib/adaptive-compression/adapt.c
index 2182ad1e8..d3ffe6a81 100644
--- a/contrib/adaptive-compression/adapt.c
+++ b/contrib/adaptive-compression/adapt.c
@@ -682,17 +682,30 @@ static int performCompression(adaptCCtx* ctx, FILE* const srcFile, outputThreadA
 
     /* creating jobs */
     for ( ; ; ) {
-        size_t const readSize = fread(ctx->input.buffer.start + ctx->input.filled, 1, FILE_CHUNK_SIZE, srcFile);
-        if (readSize != FILE_CHUNK_SIZE && !feof(srcFile)) {
+        size_t pos = 0;
+        size_t const readBlockSize = 1 << 15;
+        size_t remaining = FILE_CHUNK_SIZE;
+        while (remaining != 0 && !feof(srcFile)) {
+            size_t const ret = fread(ctx->input.buffer.start + ctx->input.filled + pos, 1, readBlockSize, srcFile);
+            if (ret != readBlockSize && !feof(srcFile)) {
+                /* error could not read correct number of bytes */
+                DISPLAY("Error: problem occurred during read from src file\n");
+                signalErrorToThreads(ctx);
+                return 1;
+            }
+            pos += ret;
+            remaining -= ret;
+        }
+        if (remaining != 0 && !feof(srcFile)) {
             DISPLAY("Error: problem occurred during read from src file\n");
             signalErrorToThreads(ctx);
             return 1;
         }
-        g_streamedSize += readSize;
+        g_streamedSize += pos;
         /* reading was fine, now create the compression job */
         {
             int const last = feof(srcFile);
-            int const error = createCompressionJob(ctx, readSize, last);
+            int const error = createCompressionJob(ctx, pos, last);
             if (error != 0) {
                 signalErrorToThreads(ctx);
                 return error;