sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-12-08 00:03:24 -05:00
Code Issues Projects Releases Wiki Activity

Always update bytes status in FIO_ctx_t

Browse Source
This commit is contained in:
senhuang42 2020-09-03 20:23:30 -04:00
parent 60ee0519ca
commit 28a9dc78c3
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
programs/fileio.c
View File

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