ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cli no print

Browse Source 
Change looping behavior to match old
This commit is contained in:
George Lu
2018-06-18 15:38:14 -07:00
parent e482e328cd
commit a3c8b59990
3 changed files with 31 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/zstdcli.c
+18 -8
View File
@@ -32,7 +32,7 @@
#include <errno.h> /* errno */
#include "fileio.h" /* stdinmark, stdoutmark, ZSTD_EXTENSION */
#ifndef ZSTD_NOBENCH
# include "bench.h" /* BMK_benchFiles, BMK_SetNbSeconds */
# include "bench.h" /* BMK_benchFiles */
#endif
#ifndef ZSTD_NODICT
# include "dibio.h" /* ZDICT_cover_params_t, DiB_trainFromFiles() */
@@ -816,15 +816,25 @@ int main(int argCount, const char* argv[])
adv.ldmHashEveryLog = g_ldmHashEveryLog;
}
for(; cLevel <= cLevelLast; cLevel++) {
if(separateFiles) {
unsigned i;
for(i = 0; i < filenameIdx; i++) {
BMK_benchFilesAdvanced(&filenameTable[i], 1, dictFileName, cLevel, &compressionParams, g_displayLevel, &adv);
if (cLevel > ZSTD_maxCLevel()) cLevel = ZSTD_maxCLevel();
if (cLevelLast > ZSTD_maxCLevel()) cLevelLast = ZSTD_maxCLevel();
if (cLevelLast < cLevel) cLevelLast = cLevel;
if (cLevelLast > cLevel)
DISPLAYLEVEL(2, "Benchmarking levels from %d to %d\n", cLevel, cLevelLast);
if(separateFiles) {
unsigned i;
for(i = 0; i < filenameIdx; i++) {
DISPLAYLEVEL(2, "Benchmarking %s \n", filenameTable[i]);
int c;
for(c = cLevel; c <= cLevelLast; c++) {
BMK_benchFilesAdvanced(&filenameTable[i], 1, dictFileName, c, &compressionParams, g_displayLevel, &adv);
}
} else {
BMK_benchFilesAdvanced(filenameTable, filenameIdx, dictFileName, cLevel, &compressionParams, g_displayLevel, &adv);
}
} else {
for(; cLevel <= cLevelLast; cLevel++) {
BMK_benchFilesAdvanced(filenameTable, filenameIdx, dictFileName, cLevel, &compressionParams, g_displayLevel, &adv);
}
}
#else