From 47b68908b25f99ca2fc700bbbcf0c9e3c4dd86ba Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 5 Nov 2015 15:14:17 +0100 Subject: [PATCH] rename lazy2 --- lib/zstdhc.c | 6 +++--- lib/zstdhc_static.h | 12 ++++++------ programs/paramgrill.c | 5 ++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/zstdhc.c b/lib/zstdhc.c index 31e00776..178ac970 100644 --- a/lib/zstdhc.c +++ b/lib/zstdhc.c @@ -626,7 +626,7 @@ size_t ZSTD_HC_compressBlock_btlazy2(ZSTD_HC_CCtx* ctx, void* dst, size_t maxDst return ZSTD_HC_compressBlock_lazy_generic(ctx, dst, maxDstSize, src, srcSize, 1, 1); } -size_t ZSTD_HC_compressBlock_hclazy2(ZSTD_HC_CCtx* ctx, void* dst, size_t maxDstSize, const void* src, size_t srcSize) +size_t ZSTD_HC_compressBlock_lazy2(ZSTD_HC_CCtx* ctx, void* dst, size_t maxDstSize, const void* src, size_t srcSize) { return ZSTD_HC_compressBlock_lazy_generic(ctx, dst, maxDstSize, src, srcSize, 0, 1); } @@ -727,8 +727,8 @@ static ZSTD_HC_blockCompressor ZSTD_HC_selectBlockCompressor(ZSTD_HC_strategy st return ZSTD_HC_compressBlock_greedy; case ZSTD_HC_lazy: return ZSTD_HC_compressBlock_lazy; - case ZSTD_HC_hclazy2: - return ZSTD_HC_compressBlock_hclazy2; + case ZSTD_HC_lazy2: + return ZSTD_HC_compressBlock_lazy2; case ZSTD_HC_btlazy2: return ZSTD_HC_compressBlock_btlazy2; } diff --git a/lib/zstdhc_static.h b/lib/zstdhc_static.h index b49aef20..aa76781e 100644 --- a/lib/zstdhc_static.h +++ b/lib/zstdhc_static.h @@ -46,7 +46,7 @@ extern "C" { * Types ***************************************/ /** from faster to stronger */ -typedef enum { ZSTD_HC_greedy, ZSTD_HC_lazy, ZSTD_HC_hclazy2, ZSTD_HC_btlazy2 } ZSTD_HC_strategy; +typedef enum { ZSTD_HC_greedy, ZSTD_HC_lazy, ZSTD_HC_lazy2, ZSTD_HC_btlazy2 } ZSTD_HC_strategy; typedef struct { @@ -112,11 +112,11 @@ static const ZSTD_HC_parameters ZSTD_HC_defaultParameters[ZSTD_HC_MAX_CLEVEL+1] { 21, 19, 20, 4, 5, ZSTD_HC_lazy }, /* level 8 */ { 21, 19, 20, 5, 5, ZSTD_HC_lazy }, /* level 9 */ { 21, 20, 20, 5, 5, ZSTD_HC_lazy }, /* level 10 */ - { 21, 20, 20, 5, 5, ZSTD_HC_hclazy2 }, /* level 11 */ - { 22, 20, 22, 5, 5, ZSTD_HC_hclazy2 }, /* level 12 */ - { 22, 20, 22, 6, 5, ZSTD_HC_hclazy2 }, /* level 13 */ - { 22, 21, 22, 6, 5, ZSTD_HC_hclazy2 }, /* level 14 */ - { 22, 21, 22, 6, 5, ZSTD_HC_hclazy2 }, /* level 15 */ + { 21, 20, 20, 5, 5, ZSTD_HC_lazy2 }, /* level 11 */ + { 22, 20, 22, 5, 5, ZSTD_HC_lazy2 }, /* level 12 */ + { 22, 20, 22, 6, 5, ZSTD_HC_lazy2 }, /* level 13 */ + { 22, 21, 22, 6, 5, ZSTD_HC_lazy2 }, /* level 14 */ + { 22, 21, 22, 6, 5, ZSTD_HC_lazy2 }, /* level 15 */ { 22, 21, 22, 4, 5, ZSTD_HC_btlazy2 }, /* level 16 */ { 23, 23, 23, 4, 5, ZSTD_HC_btlazy2 }, /* level 17 */ { 23, 23, 23, 5, 5, ZSTD_HC_btlazy2 }, /* level 18 */ diff --git a/programs/paramgrill.c b/programs/paramgrill.c index b133a949..af1e83aa 100644 --- a/programs/paramgrill.c +++ b/programs/paramgrill.c @@ -429,7 +429,10 @@ static size_t BMK_benchParam(BMK_result_t* resultPtr, } -const char* g_stratName[] = { "ZSTD_HC_greedy ", "ZSTD_HC_lazy ", "ZSTD_HC_hclazy2", "ZSTD_HC_btlazy2" }; +const char* g_stratName[] = { "ZSTD_HC_greedy ", + "ZSTD_HC_lazy ", + "ZSTD_HC_lazy2 ", + "ZSTD_HC_btlazy2" }; static void BMK_printWinner(FILE* f, U32 cLevel, BMK_result_t result, ZSTD_HC_parameters params, size_t srcSize) {