From: inikep Date: Mon, 14 Mar 2016 14:59:04 +0000 (+0100) Subject: removed DEFAULT_CHUNKSIZE X-Git-Tag: v0.6.0^2~17^2~17^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44af12deb1fd882d3651681a9a21b1356fa61ab8;p=thirdparty%2Fzstd.git removed DEFAULT_CHUNKSIZE --- diff --git a/programs/bench.c b/programs/bench.c index 13ec3106a..6179dda0f 100644 --- a/programs/bench.c +++ b/programs/bench.c @@ -83,6 +83,10 @@ /* ************************************* * Constants ***************************************/ +#ifndef ZSTD_VERSION +# define ZSTD_VERSION "" +#endif + #define NBLOOPS 3 #define TIMELOOP 2500 @@ -91,7 +95,6 @@ #define GB *(1U<<30) static const size_t maxMemory = (sizeof(size_t)==4) ? (2 GB - 64 MB) : (size_t)(1ULL << ((sizeof(size_t)*8)-31)); -#define DEFAULT_CHUNKSIZE (4 MB) static U32 g_compressibilityDefault = 50; @@ -425,12 +428,12 @@ static void BMK_benchCLevel(void* srcBuffer, size_t benchedSize, if (cLevel < 0) { int l; memset(&total, 0, sizeof(total)); - char* pch = strrchr(displayName, '\\'); /* Windows */ + const char* pch = strrchr(displayName, '\\'); /* Windows */ if (!pch) pch = strrchr(displayName, '/'); /* Linux */ if (pch) displayName = pch+1; if (g_displayLevel == 1) - DISPLAY("- input %u bytes, %i iterations, %u KB blocks\n", (U32)benchedSize, nbIterations, (U32)(g_blockSize>>10)); + DISPLAY("bench %s: input %u bytes, %i iterations, %u KB blocks\n", ZSTD_VERSION, (U32)benchedSize, nbIterations, (U32)(g_blockSize>>10)); for (l=1; l <= -cLevel; l++) { BMK_benchMem(srcBuffer, benchedSize, diff --git a/programs/fullbench.c b/programs/fullbench.c index 0eeb88e85..f6a2321ec 100644 --- a/programs/fullbench.c +++ b/programs/fullbench.c @@ -94,7 +94,6 @@ #define KNUTH 2654435761U #define MAX_MEM (1984 MB) -#define DEFAULT_CHUNKSIZE (4<<20) #define COMPRESSIBILITY_DEFAULT 0.50 static const size_t sampleSize = 10000000; diff --git a/programs/paramgrill.c b/programs/paramgrill.c index fb82d926a..1b55f11c9 100644 --- a/programs/paramgrill.c +++ b/programs/paramgrill.c @@ -100,7 +100,6 @@ #define NB_LEVELS_TRACKED 30 static const size_t maxMemory = (sizeof(size_t)==4) ? (2 GB - 64 MB) : (size_t)(1ULL << ((sizeof(size_t)*8)-31)); -#define DEFAULT_CHUNKSIZE (4<<20) #define COMPRESSIBILITY_DEFAULT 0.50 static const size_t sampleSize = 10000000;