diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2017-03-10 22:47:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-10 22:47:16 (GMT) |
| commit | 93b3b08ef62567be3585a3cd6fc1147ed0ff7045 (patch) | |
| tree | 22de7580009069fa8fe1e6b643ccb870b00f6872 | |
| parent | 9141ada8de016b201520c009cbfff527b8c3c119 (diff) | |
| parent | cb1671955a056302c804ff09d6edf0e095566274 (diff) | |
| download | lz4-93b3b08ef62567be3585a3cd6fc1147ed0ff7045.zip lz4-93b3b08ef62567be3585a3cd6fc1147ed0ff7045.tar.gz lz4-93b3b08ef62567be3585a3cd6fc1147ed0ff7045.tar.bz2 | |
Merge pull request #330 from inikep/dev
fix bench
| -rw-r--r-- | programs/bench.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/programs/bench.c b/programs/bench.c index 71d3896..77a9e3f 100644 --- a/programs/bench.c +++ b/programs/bench.c @@ -455,8 +455,13 @@ static void BMK_benchFileTable(const char** fileNamesTable, unsigned nbFiles, benchedSize = BMK_findMaxMem(totalSizeToLoad * 3) / 3; if (benchedSize==0) EXM_THROW(12, "not enough memory"); if ((U64)benchedSize > totalSizeToLoad) benchedSize = (size_t)totalSizeToLoad; - if (benchedSize < totalSizeToLoad) - DISPLAY("Not enough memory; testing %u MB only...\n", (U32)(benchedSize >> 20)); + if (benchedSize > LZ4_MAX_INPUT_SIZE) { + benchedSize = LZ4_MAX_INPUT_SIZE; + DISPLAY("File(s) bigger than LZ4's max input size; testing %u MB only...\n", (U32)(benchedSize >> 20)); + } else { + if (benchedSize < totalSizeToLoad) + DISPLAY("Not enough memory; testing %u MB only...\n", (U32)(benchedSize >> 20)); + } srcBuffer = malloc(benchedSize + !benchedSize); /* avoid alloc of zero */ if (!srcBuffer) EXM_THROW(12, "not enough memory"); |