facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add padding to remove previous line's leftovers, and keep the printed line to around the same size

Browse Source
This commit is contained in:
senhuang42 2020-09-15 13:01:46 -04:00
parent 05622992d5
commit cad6bf99af
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
programs/fileio.c
View File

@ -1338,13 +1338,22 @@ FIO_compressZstdFrame(FIO_ctx_t* const fCtx,
cShare ); cShare );
} else { /* summarized notifications if == 2 */ } else { /* summarized notifications if == 2 */
if (fCtx->nbFilesTotal > 1) { if (fCtx->nbFilesTotal > 1) {
DISPLAYLEVEL(2, "\rCompressing %u/%u files. Current source: %s ", fCtx->currFileIdx+1, fCtx->nbFilesTotal, srcFileName); size_t srcFileNameSize = strlen(srcFileName);
/* Ensure that the string we print is roughly the same size each time */
if (srcFileNameSize > 20) {
const char* truncatedSrcFileName = srcFileName + srcFileNameSize - 17;
DISPLAYLEVEL(2, "\rCompressing %2u / %2u files. Current source: ...%s ",
fCtx->currFileIdx+1, fCtx->nbFilesTotal, truncatedSrcFileName);
} else {
DISPLAYLEVEL(2, "\rCompressing %2u / %2u files. Current source: %*s ",
fCtx->currFileIdx+1, fCtx->nbFilesTotal, (int)(20-srcFileNameSize), srcFileName);
}
} else { } else {
DISPLAYLEVEL(2, "\r"); DISPLAYLEVEL(2, "\r");
} }
DISPLAYLEVEL(2, "Read : %u ", (unsigned)(zfp.consumed >> 20)); DISPLAYLEVEL(2, "Read : %2u ", (unsigned)(zfp.consumed >> 20));
if (fileSize != UTIL_FILESIZE_UNKNOWN) if (fileSize != UTIL_FILESIZE_UNKNOWN)
DISPLAYLEVEL(2, "/ %u ", (unsigned)(fileSize >> 20)); DISPLAYLEVEL(2, "/ %2u ", (unsigned)(fileSize >> 20));
DISPLAYLEVEL(2, "MB ==> %2.f%% ", cShare); DISPLAYLEVEL(2, "MB ==> %2.f%% ", cShare);
DELAY_NEXT_UPDATE(); DELAY_NEXT_UPDATE();
} }
@ -1817,9 +1826,9 @@ int FIO_compressMultipleFilenames(FIO_ctx_t* const fCtx,
} }
if (fCtx->nbFilesProcessed >= 1 && fCtx->nbFilesTotal > 1 && fCtx->totalBytesInput != 0) if (fCtx->nbFilesProcessed >= 1 && fCtx->nbFilesTotal > 1 && fCtx->totalBytesInput != 0)
DISPLAYLEVEL(2, "%d files compressed : %.2f%% (%6zu => %6zu bytes)\n", fCtx->nbFilesProcessed, DISPLAYLEVEL(2, "%d files compressed : %.2f%% (%6zu => %6zu %-40s\n", fCtx->nbFilesProcessed,
(double)fCtx->totalBytesOutput/((double)fCtx->totalBytesInput)*100, (double)fCtx->totalBytesOutput/((double)fCtx->totalBytesInput)*100,
fCtx->totalBytesInput, fCtx->totalBytesOutput); fCtx->totalBytesInput, fCtx->totalBytesOutput, "bytes)");
FIO_freeCResources(ress); FIO_freeCResources(ress);
return error; return error;