lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-05 19:15:58 +03:00
Code Activity

rename lazy2

Browse Source
This commit is contained in:
Yann Collet
2015-11-05 15:14:17 +01:00
parent 9036105b62
commit 47b68908b2
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/zstdhc.c
View File

@@ -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); 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); 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; return ZSTD_HC_compressBlock_greedy;
case ZSTD_HC_lazy: case ZSTD_HC_lazy:
return ZSTD_HC_compressBlock_lazy; return ZSTD_HC_compressBlock_lazy;
case ZSTD_HC_hclazy2: case ZSTD_HC_lazy2:
return ZSTD_HC_compressBlock_hclazy2; return ZSTD_HC_compressBlock_lazy2;
case ZSTD_HC_btlazy2: case ZSTD_HC_btlazy2:
return ZSTD_HC_compressBlock_btlazy2; return ZSTD_HC_compressBlock_btlazy2;
} }

12
lib/zstdhc_static.h
View File

@@ -46,7 +46,7 @@ extern "C" {
* Types * Types
***************************************/ ***************************************/
/** from faster to stronger */ /** 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 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, 4, 5, ZSTD_HC_lazy }, /* level 8 */
{ 21, 19, 20, 5, 5, ZSTD_HC_lazy }, /* level 9 */ { 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_lazy }, /* level 10 */
{ 21, 20, 20, 5, 5, ZSTD_HC_hclazy2 }, /* level 11 */ { 21, 20, 20, 5, 5, ZSTD_HC_lazy2 }, /* level 11 */
{ 22, 20, 22, 5, 5, ZSTD_HC_hclazy2 }, /* level 12 */ { 22, 20, 22, 5, 5, ZSTD_HC_lazy2 }, /* level 12 */
{ 22, 20, 22, 6, 5, ZSTD_HC_hclazy2 }, /* level 13 */ { 22, 20, 22, 6, 5, ZSTD_HC_lazy2 }, /* level 13 */
{ 22, 21, 22, 6, 5, ZSTD_HC_hclazy2 }, /* level 14 */ { 22, 21, 22, 6, 5, ZSTD_HC_lazy2 }, /* level 14 */
{ 22, 21, 22, 6, 5, ZSTD_HC_hclazy2 }, /* level 15 */ { 22, 21, 22, 6, 5, ZSTD_HC_lazy2 }, /* level 15 */
{ 22, 21, 22, 4, 5, ZSTD_HC_btlazy2 }, /* level 16 */ { 22, 21, 22, 4, 5, ZSTD_HC_btlazy2 }, /* level 16 */
{ 23, 23, 23, 4, 5, ZSTD_HC_btlazy2 }, /* level 17 */ { 23, 23, 23, 4, 5, ZSTD_HC_btlazy2 }, /* level 17 */
{ 23, 23, 23, 5, 5, ZSTD_HC_btlazy2 }, /* level 18 */ { 23, 23, 23, 5, 5, ZSTD_HC_btlazy2 }, /* level 18 */

5
programs/paramgrill.c
View File

@@ -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) static void BMK_printWinner(FILE* f, U32 cLevel, BMK_result_t result, ZSTD_HC_parameters params, size_t srcSize)
{ {