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

fix : zstd cli can be built with build macro ZSTD_NOBENCH

Browse Source 
which disables bench.c module
This commit is contained in:
Yann Collet
2018-08-03 07:54:29 -07:00
parent b002eac69a
commit 5203f01774
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -65,7 +65,7 @@ zlibwrapper:
.PHONY: test .PHONY: test
test: MOREFLAGS += -g -DDEBUGLEVEL=1 -Werror test: MOREFLAGS += -g -DDEBUGLEVEL=1 -Werror
test: test:
MOREFLAGS="$(MOREFLAGS)" $(MAKE) -C $(PRGDIR) allVariants MOREFLAGS="$(MOREFLAGS)" $(MAKE) -j -C $(PRGDIR) allVariants
$(MAKE) -C $(TESTDIR) $@ $(MAKE) -C $(TESTDIR) $@
.PHONY: shortest .PHONY: shortest
programs/zstdcli.c
+17 -15
View File
@@ -406,7 +406,6 @@ int main(int argCount, const char* argv[])
singleThread = 0, singleThread = 0,
ultra=0; ultra=0;
double compressibility = 0.5; double compressibility = 0.5;
BMK_advancedParams_t adv = BMK_initAdvancedParams();
unsigned bench_nbSeconds = 3; /* would be better if this value was synchronized from bench */ unsigned bench_nbSeconds = 3; /* would be better if this value was synchronized from bench */
size_t blockSize = 0; size_t blockSize = 0;
zstd_operation_mode operation = zom_compress; zstd_operation_mode operation = zom_compress;
@@ -434,6 +433,9 @@ int main(int argCount, const char* argv[])
ZDICT_cover_params_t coverParams = defaultCoverParams(); ZDICT_cover_params_t coverParams = defaultCoverParams();
int cover = 1; int cover = 1;
#endif #endif
#ifndef ZSTD_NOBENCH
BMK_advancedParams_t benchParams = BMK_initAdvancedParams();
#endif
/* init */ /* init */
@@ -620,7 +622,7 @@ int main(int argCount, const char* argv[])
/* Decoding */ /* Decoding */
case 'd': case 'd':
#ifndef ZSTD_NOBENCH #ifndef ZSTD_NOBENCH
adv.mode = BMK_decodeOnly; benchParams.mode = BMK_decodeOnly;
if (operation==zom_bench) { argument++; break; } /* benchmark decode (hidden option) */ if (operation==zom_bench) { argument++; break; } /* benchmark decode (hidden option) */
#endif #endif
operation=zom_decompress; argument++; break; operation=zom_decompress; argument++; break;
@@ -713,7 +715,7 @@ int main(int argCount, const char* argv[])
case 'p': argument++; case 'p': argument++;
#ifndef ZSTD_NOBENCH #ifndef ZSTD_NOBENCH
if ((*argument>='0') && (*argument<='9')) { if ((*argument>='0') && (*argument<='9')) {
adv.additionalParam = (int)readU32FromChar(&argument); benchParams.additionalParam = (int)readU32FromChar(&argument);
} else } else
#endif #endif
main_pause=1; main_pause=1;
@@ -826,18 +828,18 @@ int main(int argCount, const char* argv[])
/* Check if benchmark is selected */ /* Check if benchmark is selected */
if (operation==zom_bench) { if (operation==zom_bench) {
#ifndef ZSTD_NOBENCH #ifndef ZSTD_NOBENCH
adv.blockSize = blockSize; benchParams.blockSize = blockSize;
adv.nbWorkers = nbWorkers; benchParams.nbWorkers = nbWorkers;
adv.realTime = setRealTimePrio; benchParams.realTime = setRealTimePrio;
adv.nbSeconds = bench_nbSeconds; benchParams.nbSeconds = bench_nbSeconds;
adv.ldmFlag = ldmFlag; benchParams.ldmFlag = ldmFlag;
adv.ldmMinMatch = g_ldmMinMatch; benchParams.ldmMinMatch = g_ldmMinMatch;
adv.ldmHashLog = g_ldmHashLog; benchParams.ldmHashLog = g_ldmHashLog;
if (g_ldmBucketSizeLog != LDM_PARAM_DEFAULT) { if (g_ldmBucketSizeLog != LDM_PARAM_DEFAULT) {
adv.ldmBucketSizeLog = g_ldmBucketSizeLog; benchParams.ldmBucketSizeLog = g_ldmBucketSizeLog;
} }
if (g_ldmHashEveryLog != LDM_PARAM_DEFAULT) { if (g_ldmHashEveryLog != LDM_PARAM_DEFAULT) {
adv.ldmHashEveryLog = g_ldmHashEveryLog; benchParams.ldmHashEveryLog = g_ldmHashEveryLog;
} }
if (cLevel > ZSTD_maxCLevel()) cLevel = ZSTD_maxCLevel(); if (cLevel > ZSTD_maxCLevel()) cLevel = ZSTD_maxCLevel();
@@ -852,17 +854,17 @@ int main(int argCount, const char* argv[])
int c; int c;
DISPLAYLEVEL(2, "Benchmarking %s \n", filenameTable[i]); DISPLAYLEVEL(2, "Benchmarking %s \n", filenameTable[i]);
for(c = cLevel; c <= cLevelLast; c++) { for(c = cLevel; c <= cLevelLast; c++) {
BMK_benchFilesAdvanced(&filenameTable[i], 1, dictFileName, c, &compressionParams, g_displayLevel, &adv); BMK_benchFilesAdvanced(&filenameTable[i], 1, dictFileName, c, &compressionParams, g_displayLevel, &benchParams);
} }
} }
} else { } else {
for(; cLevel <= cLevelLast; cLevel++) { for(; cLevel <= cLevelLast; cLevel++) {
BMK_benchFilesAdvanced(filenameTable, filenameIdx, dictFileName, cLevel, &compressionParams, g_displayLevel, &adv); BMK_benchFilesAdvanced(filenameTable, filenameIdx, dictFileName, cLevel, &compressionParams, g_displayLevel, &benchParams);
} }
} }
} else { } else {
for(; cLevel <= cLevelLast; cLevel++) { for(; cLevel <= cLevelLast; cLevel++) {
BMK_syntheticTest(cLevel, compressibility, &compressionParams, g_displayLevel, &adv); BMK_syntheticTest(cLevel, compressibility, &compressionParams, g_displayLevel, &benchParams);
} }
} }