From: senhuang42 <senhuang96@fb.com>
Date: Fri, 4 Sep 2020 00:23:30 +0000 (-0400)
Subject: Always update bytes status in FIO_ctx_t
X-Git-Tag: v1.4.7~77^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28a9dc78c3b4e6d35041c3ffa3dfda241ec102a1;p=thirdparty%2Fzstd.git

Always update bytes status in FIO_ctx_t
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 51f8af45c..5ba39a169 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -1508,7 +1508,8 @@ FIO_compressFilename_internal(FIO_prefs_t* const prefs,
     }
 
     /* Status */
-    
+    fCtx->totalBytesInput += (size_t)readsize;
+    fCtx->totalBytesOutput += (size_t)compressedfilesize;
     DISPLAYLEVEL(2, "\r%79s\r", "");
     if (g_display_prefs.displayLevel >= 2) {
         if (g_display_prefs.displayLevel >= 3 || fCtx->nbFilesTotal <= 1) {
@@ -1525,10 +1526,6 @@ FIO_compressFilename_internal(FIO_prefs_t* const prefs,
                     dstFileName);
             }
         }
-        if (fCtx->nbFilesTotal > 1) {
-            fCtx->totalBytesInput += (size_t)readsize;
-            fCtx->totalBytesOutput += (size_t)compressedfilesize;
-        }
     }
 
     /* Elapsed Time and CPU Load */
@@ -2429,15 +2426,13 @@ static int FIO_decompressFrames(dRess_t ress, FILE* srcFile,
     }   }  /* for each frame */
 
     /* Final Status */
+    fCtx->totalBytesOutput += (size_t)filesize;
     DISPLAYLEVEL(2, "\r%79s\r", "");
     /* No status message in pipe mode (stdin - stdout) or multi-files mode */
     if (g_display_prefs.displayLevel >= 2) {
         if (fCtx->nbFilesTotal <= 1 || g_display_prefs.displayLevel >= 3) {
             DISPLAYLEVEL(2, "%-20s: %llu bytes \n", srcFileName, filesize);
         }
-        if (fCtx->nbFilesTotal > 1) {
-            fCtx->totalBytesOutput += (size_t)filesize;
-        }
     }
 
     return 0;