2016-08-30 17:04:33 +00:00
|
|
|
/**
|
|
|
|
* Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This source code is licensed under the BSD-style license found in the
|
|
|
|
* LICENSE file in the root directory of this source tree. An additional grant
|
|
|
|
* of patent rights can be found in the PATENTS file in the same directory.
|
|
|
|
*/
|
2015-10-22 14:31:46 +00:00
|
|
|
|
|
|
|
|
2017-05-12 22:31:53 +00:00
|
|
|
/*-*************************************
|
|
|
|
* Tuning parameters
|
|
|
|
***************************************/
|
2017-05-18 01:36:15 +00:00
|
|
|
#ifndef ZSTD_CLEVEL_DEFAULT
|
|
|
|
# define ZSTD_CLEVEL_DEFAULT 3
|
2017-05-12 22:31:53 +00:00
|
|
|
#endif
|
|
|
|
|
2016-02-11 23:07:30 +00:00
|
|
|
/*-*************************************
|
2016-02-03 01:46:46 +00:00
|
|
|
* Dependencies
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2016-06-04 17:47:02 +00:00
|
|
|
#include <string.h> /* memset */
|
2015-11-11 20:38:21 +00:00
|
|
|
#include "mem.h"
|
2016-08-11 23:20:36 +00:00
|
|
|
#define FSE_STATIC_LINKING_ONLY /* FSE_encodeSymbol */
|
2016-06-04 22:58:01 +00:00
|
|
|
#include "fse.h"
|
2016-06-04 22:42:28 +00:00
|
|
|
#define HUF_STATIC_LINKING_ONLY
|
|
|
|
#include "huf.h"
|
2016-06-04 17:47:02 +00:00
|
|
|
#include "zstd_internal.h" /* includes zstd.h */
|
2015-10-22 14:31:46 +00:00
|
|
|
|
|
|
|
|
2017-04-27 07:29:04 +00:00
|
|
|
/*-*************************************
|
|
|
|
* Debug
|
|
|
|
***************************************/
|
|
|
|
#if defined(ZSTD_DEBUG) && (ZSTD_DEBUG>=1)
|
|
|
|
# include <assert.h>
|
|
|
|
#else
|
|
|
|
# define assert(condition) ((void)0)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define ZSTD_STATIC_ASSERT(c) { enum { ZSTD_static_assert = 1/(int)(!!(c)) }; }
|
|
|
|
|
|
|
|
#if defined(ZSTD_DEBUG) && (ZSTD_DEBUG>=2)
|
|
|
|
# include <stdio.h>
|
|
|
|
static unsigned g_debugLevel = ZSTD_DEBUG;
|
2017-05-19 17:17:59 +00:00
|
|
|
# define DEBUGLOG(l, ...) { \
|
|
|
|
if (l<=g_debugLevel) { \
|
|
|
|
fprintf(stderr, __FILE__ ": "); \
|
|
|
|
fprintf(stderr, __VA_ARGS__); \
|
|
|
|
fprintf(stderr, " \n"); \
|
|
|
|
} }
|
2017-04-27 07:29:04 +00:00
|
|
|
#else
|
|
|
|
# define DEBUGLOG(l, ...) {} /* disabled */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2016-02-11 23:07:30 +00:00
|
|
|
/*-*************************************
|
2015-11-11 20:38:21 +00:00
|
|
|
* Constants
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2016-03-19 14:18:42 +00:00
|
|
|
static const U32 g_searchStrength = 8; /* control skip over incompressible data */
|
2016-07-27 19:05:12 +00:00
|
|
|
#define HASH_READ_SIZE 8
|
|
|
|
typedef enum { ZSTDcs_created=0, ZSTDcs_init, ZSTDcs_ongoing, ZSTDcs_ending } ZSTD_compressionStage_e;
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2017-04-21 05:54:54 +00:00
|
|
|
/* entropy tables always have same size */
|
|
|
|
static size_t const hufCTable_size = HUF_CTABLE_SIZE(255);
|
2017-04-26 18:39:35 +00:00
|
|
|
static size_t const litlengthCTable_size = FSE_CTABLE_SIZE(LLFSELog, MaxLL);
|
|
|
|
static size_t const offcodeCTable_size = FSE_CTABLE_SIZE(OffFSELog, MaxOff);
|
|
|
|
static size_t const matchlengthCTable_size = FSE_CTABLE_SIZE(MLFSELog, MaxML);
|
2017-04-21 06:21:19 +00:00
|
|
|
static size_t const entropyScratchSpace_size = HUF_WORKSPACE_SIZE;
|
2017-04-21 01:17:58 +00:00
|
|
|
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2016-02-11 23:07:30 +00:00
|
|
|
/*-*************************************
|
2016-01-23 18:28:41 +00:00
|
|
|
* Helper functions
|
|
|
|
***************************************/
|
2017-04-01 00:11:38 +00:00
|
|
|
size_t ZSTD_compressBound(size_t srcSize) {
|
2017-04-01 01:27:03 +00:00
|
|
|
size_t const lowLimit = 256 KB;
|
|
|
|
size_t const margin = (srcSize < lowLimit) ? (lowLimit-srcSize) >> 12 : 0; /* from 64 to 0 */
|
2017-04-01 00:11:38 +00:00
|
|
|
return srcSize + (srcSize >> 8) + margin;
|
|
|
|
}
|
2016-01-23 18:28:41 +00:00
|
|
|
|
|
|
|
|
2016-02-11 23:07:30 +00:00
|
|
|
/*-*************************************
|
2015-11-11 20:38:21 +00:00
|
|
|
* Sequence storage
|
|
|
|
***************************************/
|
|
|
|
static void ZSTD_resetSeqStore(seqStore_t* ssPtr)
|
|
|
|
{
|
|
|
|
ssPtr->lit = ssPtr->litStart;
|
2016-07-29 22:55:13 +00:00
|
|
|
ssPtr->sequences = ssPtr->sequencesStart;
|
2016-04-07 15:19:00 +00:00
|
|
|
ssPtr->longLengthID = 0;
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-11 23:07:30 +00:00
|
|
|
/*-*************************************
|
2015-11-11 20:38:21 +00:00
|
|
|
* Context memory management
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2017-05-18 01:36:15 +00:00
|
|
|
typedef enum { zcss_init=0, zcss_load, zcss_flush, zcss_final } ZSTD_cStreamStage;
|
2017-05-08 23:08:01 +00:00
|
|
|
|
2017-05-23 01:21:51 +00:00
|
|
|
struct ZSTD_CDict_s {
|
|
|
|
void* dictBuffer;
|
|
|
|
const void* dictContent;
|
|
|
|
size_t dictContentSize;
|
|
|
|
ZSTD_CCtx* refContext;
|
|
|
|
}; /* typedef'd tp ZSTD_CDict within "zstd.h" */
|
|
|
|
|
2016-12-23 21:25:03 +00:00
|
|
|
struct ZSTD_CCtx_s {
|
2015-11-13 10:27:46 +00:00
|
|
|
const BYTE* nextSrc; /* next block here to continue on current prefix */
|
2015-10-22 15:55:40 +00:00
|
|
|
const BYTE* base; /* All regular indexes relative to this position */
|
|
|
|
const BYTE* dictBase; /* extDict indexes relative to this position */
|
2015-10-22 14:31:46 +00:00
|
|
|
U32 dictLimit; /* below that point, need extDict */
|
2015-10-22 15:55:40 +00:00
|
|
|
U32 lowLimit; /* below that point, no more data */
|
2015-10-22 14:31:46 +00:00
|
|
|
U32 nextToUpdate; /* index from which to continue dictionary update */
|
2016-02-19 09:09:35 +00:00
|
|
|
U32 nextToUpdate3; /* index from which to continue dictionary update */
|
2016-03-23 14:53:38 +00:00
|
|
|
U32 hashLog3; /* dispatch table : larger == faster, more memory */
|
2017-01-26 00:25:38 +00:00
|
|
|
U32 loadedDictEnd; /* index of end of dictionary */
|
|
|
|
U32 forceWindow; /* force back-references to respect limit of 1<<wLog, even for dictionary */
|
2017-02-24 07:42:12 +00:00
|
|
|
U32 forceRawDict; /* Force loading dictionary in "content-only" mode (no header analysis) */
|
2016-07-27 19:05:12 +00:00
|
|
|
ZSTD_compressionStage_e stage;
|
2016-06-13 23:49:25 +00:00
|
|
|
U32 rep[ZSTD_REP_NUM];
|
2017-01-20 01:33:37 +00:00
|
|
|
U32 repToConfirm[ZSTD_REP_NUM];
|
2016-05-29 03:01:04 +00:00
|
|
|
U32 dictID;
|
2017-05-12 22:31:53 +00:00
|
|
|
int compressionLevel;
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_parameters requestedParams;
|
|
|
|
ZSTD_parameters appliedParams;
|
2015-10-29 17:41:45 +00:00
|
|
|
void* workSpace;
|
|
|
|
size_t workSpaceSize;
|
2015-12-02 13:00:45 +00:00
|
|
|
size_t blockSize;
|
2016-06-05 22:26:38 +00:00
|
|
|
U64 frameContentSize;
|
2017-04-12 01:34:02 +00:00
|
|
|
U64 consumedSrcSize;
|
2016-05-31 16:13:56 +00:00
|
|
|
XXH64_state_t xxhState;
|
2016-06-02 11:04:18 +00:00
|
|
|
ZSTD_customMem customMem;
|
2017-05-23 20:16:00 +00:00
|
|
|
size_t staticSize;
|
2016-01-07 14:35:18 +00:00
|
|
|
|
2015-10-29 17:41:45 +00:00
|
|
|
seqStore_t seqStore; /* sequences storage ptrs */
|
2015-10-25 13:06:35 +00:00
|
|
|
U32* hashTable;
|
2016-02-19 09:09:35 +00:00
|
|
|
U32* hashTable3;
|
2016-04-04 11:49:18 +00:00
|
|
|
U32* chainTable;
|
2017-04-21 05:54:54 +00:00
|
|
|
HUF_repeat hufCTable_repeatMode;
|
|
|
|
HUF_CElt* hufCTable;
|
|
|
|
U32 fseCTables_ready;
|
2017-04-21 06:03:38 +00:00
|
|
|
FSE_CTable* offcodeCTable;
|
|
|
|
FSE_CTable* matchlengthCTable;
|
|
|
|
FSE_CTable* litlengthCTable;
|
2017-04-26 18:39:35 +00:00
|
|
|
unsigned* entropyScratchSpace;
|
2017-05-08 23:08:01 +00:00
|
|
|
|
|
|
|
/* streaming */
|
|
|
|
ZSTD_CDict* cdictLocal;
|
|
|
|
const ZSTD_CDict* cdict;
|
|
|
|
char* inBuff;
|
|
|
|
size_t inBuffSize;
|
|
|
|
size_t inToCompress;
|
|
|
|
size_t inBuffPos;
|
|
|
|
size_t inBuffTarget;
|
|
|
|
char* outBuff;
|
|
|
|
size_t outBuffSize;
|
|
|
|
size_t outBuffContentSize;
|
|
|
|
size_t outBuffFlushedSize;
|
|
|
|
ZSTD_cStreamStage streamStage;
|
|
|
|
U32 frameEnded;
|
2015-10-22 14:31:46 +00:00
|
|
|
};
|
|
|
|
|
2015-11-11 12:43:58 +00:00
|
|
|
ZSTD_CCtx* ZSTD_createCCtx(void)
|
2015-10-22 14:31:46 +00:00
|
|
|
{
|
2017-05-31 00:11:39 +00:00
|
|
|
return ZSTD_createCCtx_advanced(ZSTD_defaultCMem);
|
2016-05-23 13:49:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
|
|
|
|
{
|
2016-07-14 14:52:45 +00:00
|
|
|
ZSTD_CCtx* cctx;
|
2016-05-23 14:24:52 +00:00
|
|
|
|
2017-05-31 00:11:39 +00:00
|
|
|
if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
|
2016-05-23 13:49:09 +00:00
|
|
|
|
2017-05-31 00:45:37 +00:00
|
|
|
cctx = (ZSTD_CCtx*) ZSTD_calloc(sizeof(ZSTD_CCtx), customMem);
|
2016-07-14 14:52:45 +00:00
|
|
|
if (!cctx) return NULL;
|
2017-01-26 00:25:38 +00:00
|
|
|
cctx->customMem = customMem;
|
2017-05-18 01:36:15 +00:00
|
|
|
cctx->compressionLevel = ZSTD_CLEVEL_DEFAULT;
|
2016-07-14 14:52:45 +00:00
|
|
|
return cctx;
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
|
|
|
|
2017-05-23 20:16:00 +00:00
|
|
|
ZSTD_CCtx* ZSTD_initStaticCCtx(void *workspace, size_t workspaceSize)
|
|
|
|
{
|
|
|
|
ZSTD_CCtx* cctx = (ZSTD_CCtx*) workspace;
|
|
|
|
if (workspaceSize <= sizeof(ZSTD_CCtx)) return NULL; /* minimum size */
|
|
|
|
if ((size_t)workspace & 7) return NULL; /* must be 8-aligned */
|
|
|
|
memset(workspace, 0, workspaceSize);
|
|
|
|
cctx->staticSize = workspaceSize;
|
|
|
|
cctx->workSpace = (void*)(cctx+1);
|
|
|
|
cctx->workSpaceSize = workspaceSize - sizeof(ZSTD_CCtx);
|
|
|
|
|
|
|
|
/* entropy space (never moves) */
|
|
|
|
/* note : this code should be shared with resetCCtx, instead of copied */
|
|
|
|
{ void* ptr = cctx->workSpace;
|
|
|
|
cctx->hufCTable = (HUF_CElt*)ptr;
|
2017-05-25 00:41:41 +00:00
|
|
|
ptr = (char*)cctx->hufCTable + hufCTable_size;
|
2017-05-23 20:16:00 +00:00
|
|
|
cctx->offcodeCTable = (FSE_CTable*) ptr;
|
|
|
|
ptr = (char*)ptr + offcodeCTable_size;
|
|
|
|
cctx->matchlengthCTable = (FSE_CTable*) ptr;
|
|
|
|
ptr = (char*)ptr + matchlengthCTable_size;
|
|
|
|
cctx->litlengthCTable = (FSE_CTable*) ptr;
|
|
|
|
ptr = (char*)ptr + litlengthCTable_size;
|
|
|
|
assert(((size_t)ptr & 3) == 0); /* ensure correct alignment */
|
|
|
|
cctx->entropyScratchSpace = (unsigned*) ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cctx;
|
|
|
|
}
|
|
|
|
|
2015-11-11 12:43:58 +00:00
|
|
|
size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx)
|
2015-10-25 13:06:35 +00:00
|
|
|
{
|
2016-06-03 14:36:50 +00:00
|
|
|
if (cctx==NULL) return 0; /* support free on NULL */
|
2017-05-23 20:16:00 +00:00
|
|
|
assert(!cctx->staticSize); /* not compatible with static CCtx */
|
2016-08-29 04:05:43 +00:00
|
|
|
ZSTD_free(cctx->workSpace, cctx->customMem);
|
2017-05-09 00:15:00 +00:00
|
|
|
cctx->workSpace = NULL;
|
|
|
|
ZSTD_freeCDict(cctx->cdictLocal);
|
|
|
|
cctx->cdictLocal = NULL;
|
2016-08-29 04:05:43 +00:00
|
|
|
ZSTD_free(cctx, cctx->customMem);
|
2016-02-05 01:33:10 +00:00
|
|
|
return 0; /* reserved as a potential error code in the future */
|
2015-10-25 13:06:35 +00:00
|
|
|
}
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2016-08-22 23:18:06 +00:00
|
|
|
size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx)
|
2016-07-11 01:12:17 +00:00
|
|
|
{
|
2016-09-15 00:50:27 +00:00
|
|
|
if (cctx==NULL) return 0; /* support sizeof on NULL */
|
2017-05-08 23:17:30 +00:00
|
|
|
return sizeof(*cctx) + cctx->workSpaceSize
|
|
|
|
+ ZSTD_sizeof_CDict(cctx->cdictLocal)
|
|
|
|
+ cctx->outBuffSize + cctx->inBuffSize;
|
2016-07-11 01:12:17 +00:00
|
|
|
}
|
|
|
|
|
2017-05-19 17:17:59 +00:00
|
|
|
size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs)
|
|
|
|
{
|
|
|
|
return ZSTD_sizeof_CCtx(zcs); /* same object */
|
|
|
|
}
|
|
|
|
|
2017-05-12 22:31:53 +00:00
|
|
|
/* private API call, for dictBuilder only */
|
|
|
|
const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx) { return &(ctx->seqStore); }
|
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
static ZSTD_parameters ZSTD_getParamsFromCCtx(const ZSTD_CCtx* cctx) { return cctx->appliedParams; }
|
2017-05-12 22:31:53 +00:00
|
|
|
|
2017-05-12 20:53:46 +00:00
|
|
|
/* older variant; will be deprecated */
|
2017-01-26 00:25:38 +00:00
|
|
|
size_t ZSTD_setCCtxParameter(ZSTD_CCtx* cctx, ZSTD_CCtxParameter param, unsigned value)
|
|
|
|
{
|
|
|
|
switch(param)
|
|
|
|
{
|
2017-01-26 00:39:03 +00:00
|
|
|
case ZSTD_p_forceWindow : cctx->forceWindow = value>0; cctx->loadedDictEnd = 0; return 0;
|
2017-02-24 07:42:12 +00:00
|
|
|
case ZSTD_p_forceRawDict : cctx->forceRawDict = value>0; return 0;
|
2017-01-26 00:25:38 +00:00
|
|
|
default: return ERROR(parameter_unknown);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-12 22:59:48 +00:00
|
|
|
|
2017-05-18 01:36:15 +00:00
|
|
|
#define ZSTD_CLEVEL_CUSTOM 999
|
2017-05-12 22:59:48 +00:00
|
|
|
static void ZSTD_cLevelToCParams(ZSTD_CCtx* cctx)
|
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
if (cctx->compressionLevel==ZSTD_CLEVEL_CUSTOM) return;
|
|
|
|
cctx->requestedParams.cParams = ZSTD_getCParams(cctx->compressionLevel,
|
|
|
|
cctx->frameContentSize, 0);
|
2017-05-18 01:36:15 +00:00
|
|
|
cctx->compressionLevel = ZSTD_CLEVEL_CUSTOM;
|
2017-05-12 22:59:48 +00:00
|
|
|
}
|
|
|
|
|
2017-05-12 22:31:53 +00:00
|
|
|
size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, unsigned value)
|
|
|
|
{
|
2017-05-19 18:04:41 +00:00
|
|
|
# define CLAMPCHECK(val,min,max) { \
|
|
|
|
if ((val<min) | (val>max)) { \
|
|
|
|
return ERROR(compressionParameter_unsupported); \
|
|
|
|
} }
|
|
|
|
|
2017-05-22 20:05:45 +00:00
|
|
|
if (cctx->streamStage != zcss_init) return ERROR(stage_wrong);
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
switch(param)
|
|
|
|
{
|
|
|
|
case ZSTD_p_compressionLevel :
|
2017-06-01 16:44:54 +00:00
|
|
|
if ((int)value > ZSTD_maxCLevel()) value = ZSTD_maxCLevel(); /* cap max compression level */
|
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
cctx->compressionLevel = value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_windowLog :
|
2017-06-01 16:44:54 +00:00
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
CLAMPCHECK(value, ZSTD_WINDOWLOG_MIN, ZSTD_WINDOWLOG_MAX);
|
|
|
|
ZSTD_cLevelToCParams(cctx);
|
|
|
|
cctx->requestedParams.cParams.windowLog = value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_hashLog :
|
2017-06-01 16:44:54 +00:00
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
CLAMPCHECK(value, ZSTD_HASHLOG_MIN, ZSTD_HASHLOG_MAX);
|
|
|
|
ZSTD_cLevelToCParams(cctx);
|
|
|
|
cctx->requestedParams.cParams.hashLog = value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_chainLog :
|
2017-06-01 16:44:54 +00:00
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
CLAMPCHECK(value, ZSTD_CHAINLOG_MIN, ZSTD_CHAINLOG_MAX);
|
|
|
|
ZSTD_cLevelToCParams(cctx);
|
|
|
|
cctx->requestedParams.cParams.chainLog = value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_searchLog :
|
2017-06-01 16:44:54 +00:00
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
CLAMPCHECK(value, ZSTD_SEARCHLOG_MIN, ZSTD_SEARCHLOG_MAX);
|
|
|
|
ZSTD_cLevelToCParams(cctx);
|
|
|
|
cctx->requestedParams.cParams.searchLog = value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
2017-05-18 01:36:15 +00:00
|
|
|
case ZSTD_p_minMatch :
|
2017-06-01 16:44:54 +00:00
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
CLAMPCHECK(value, ZSTD_SEARCHLENGTH_MIN, ZSTD_SEARCHLENGTH_MAX);
|
|
|
|
ZSTD_cLevelToCParams(cctx);
|
|
|
|
cctx->requestedParams.cParams.searchLength = value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_targetLength :
|
2017-06-01 16:44:54 +00:00
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
CLAMPCHECK(value, ZSTD_TARGETLENGTH_MIN, ZSTD_TARGETLENGTH_MAX);
|
|
|
|
ZSTD_cLevelToCParams(cctx);
|
|
|
|
cctx->requestedParams.cParams.targetLength = value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_compressionStrategy :
|
2017-06-01 16:44:54 +00:00
|
|
|
if (value == 0) return 0; /* special value : 0 means "don't change anything" */
|
|
|
|
CLAMPCHECK(value, (unsigned)ZSTD_fast, (unsigned)ZSTD_btultra);
|
|
|
|
ZSTD_cLevelToCParams(cctx);
|
|
|
|
cctx->requestedParams.cParams.strategy = (ZSTD_strategy)value;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
#if 0
|
|
|
|
case ZSTD_p_windowSize : /* to be done later */
|
2017-06-01 16:44:54 +00:00
|
|
|
return ERROR(compressionParameter_unsupported);
|
2017-05-12 22:31:53 +00:00
|
|
|
#endif
|
|
|
|
|
2017-06-01 16:44:54 +00:00
|
|
|
case ZSTD_p_contentSizeFlag :
|
|
|
|
/* Content size written in frame header _when known_ (default:1) */
|
|
|
|
cctx->requestedParams.fParams.contentSizeFlag = value>0;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
2017-06-01 16:44:54 +00:00
|
|
|
case ZSTD_p_checksumFlag :
|
|
|
|
/* A 32-bits content checksum will be calculated and written at end of frame (default:0) */
|
|
|
|
cctx->requestedParams.fParams.checksumFlag = value>0;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
case ZSTD_p_dictIDFlag : /* When applicable, dictionary's dictID is provided in frame header (default:1) */
|
2017-06-01 16:44:54 +00:00
|
|
|
DEBUGLOG(5, "set dictIDFlag = %u", (value>0));
|
|
|
|
cctx->requestedParams.fParams.noDictIDFlag = (value==0);
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_refDictContent : /* to be done later */
|
2017-06-01 16:44:54 +00:00
|
|
|
return ERROR(compressionParameter_unsupported);
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
case ZSTD_p_forceMaxWindow : /* Force back-references to remain < windowSize,
|
|
|
|
* even when referencing into Dictionary content
|
|
|
|
* default : 0 when using a CDict, 1 when using a Prefix */
|
|
|
|
cctx->forceWindow = value>0;
|
|
|
|
cctx->loadedDictEnd = 0;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case ZSTD_p_rawContentDict : /* load dictionary in "content-only" mode (no header analysis) (default:0) */
|
2017-06-01 16:44:54 +00:00
|
|
|
cctx->forceRawDict = value>0;
|
|
|
|
return 0;
|
2017-05-12 22:31:53 +00:00
|
|
|
|
|
|
|
default: return ERROR(parameter_unknown);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ZSTDLIB_API size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize)
|
|
|
|
{
|
2017-05-22 20:05:45 +00:00
|
|
|
if (cctx->streamStage != zcss_init) return ERROR(stage_wrong);
|
2017-05-12 22:31:53 +00:00
|
|
|
cctx->frameContentSize = pledgedSrcSize;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-18 01:36:15 +00:00
|
|
|
ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize)
|
|
|
|
{
|
2017-05-22 20:05:45 +00:00
|
|
|
if (cctx->streamStage != zcss_init) return ERROR(stage_wrong);
|
2017-05-23 20:16:00 +00:00
|
|
|
if (cctx->staticSize) return ERROR(memory_allocation); /* no malloc for static CCtx */
|
2017-05-18 01:36:15 +00:00
|
|
|
ZSTD_freeCDict(cctx->cdictLocal); /* in case one already exists */
|
|
|
|
if (dict==NULL || dictSize==0) { /* no dictionary mode */
|
|
|
|
cctx->cdictLocal = NULL;
|
|
|
|
cctx->cdict = NULL;
|
|
|
|
} else {
|
2017-05-20 02:46:15 +00:00
|
|
|
ZSTD_compressionParameters const cParams =
|
|
|
|
cctx->compressionLevel == ZSTD_CLEVEL_CUSTOM ?
|
2017-05-23 00:06:04 +00:00
|
|
|
cctx->requestedParams.cParams :
|
2017-05-20 02:46:15 +00:00
|
|
|
ZSTD_getCParams(cctx->compressionLevel, 0, dictSize);
|
2017-05-18 01:36:15 +00:00
|
|
|
cctx->cdictLocal = ZSTD_createCDict_advanced(
|
|
|
|
dict, dictSize,
|
|
|
|
0 /* byReference */,
|
2017-05-20 02:46:15 +00:00
|
|
|
cParams, cctx->customMem);
|
2017-05-18 01:36:15 +00:00
|
|
|
cctx->cdict = cctx->cdictLocal;
|
|
|
|
if (cctx->cdictLocal == NULL)
|
|
|
|
return ERROR(memory_allocation);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-12 22:31:53 +00:00
|
|
|
/* Not ready yet ! */
|
|
|
|
ZSTDLIB_API size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize)
|
2016-02-11 23:07:30 +00:00
|
|
|
{
|
2017-05-12 22:31:53 +00:00
|
|
|
(void)cctx; (void)prefix; (void)prefixSize; /* to be done later */
|
2017-05-22 20:05:45 +00:00
|
|
|
if (cctx->streamStage != zcss_init) return ERROR(stage_wrong);
|
2017-05-12 22:31:53 +00:00
|
|
|
return ERROR(compressionParameter_unsupported);
|
2016-02-11 23:07:30 +00:00
|
|
|
}
|
|
|
|
|
2017-05-12 22:31:53 +00:00
|
|
|
ZSTDLIB_API size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
|
2016-10-25 23:19:52 +00:00
|
|
|
{
|
2017-05-22 20:05:45 +00:00
|
|
|
if (cctx->streamStage != zcss_init) return ERROR(stage_wrong);
|
|
|
|
cctx->cdict = cdict;
|
2017-05-12 22:31:53 +00:00
|
|
|
return ERROR(compressionParameter_unsupported);
|
2016-10-25 23:19:52 +00:00
|
|
|
}
|
|
|
|
|
2015-11-04 11:05:27 +00:00
|
|
|
|
2016-03-30 14:50:44 +00:00
|
|
|
/** ZSTD_checkParams() :
|
|
|
|
ensure param values remain within authorized range.
|
|
|
|
@return : 0, or an error code if one value is beyond authorized range */
|
2016-03-30 17:48:05 +00:00
|
|
|
size_t ZSTD_checkCParams(ZSTD_compressionParameters cParams)
|
2016-03-30 14:50:44 +00:00
|
|
|
{
|
2016-04-04 02:22:53 +00:00
|
|
|
CLAMPCHECK(cParams.windowLog, ZSTD_WINDOWLOG_MIN, ZSTD_WINDOWLOG_MAX);
|
2016-04-04 11:49:18 +00:00
|
|
|
CLAMPCHECK(cParams.chainLog, ZSTD_CHAINLOG_MIN, ZSTD_CHAINLOG_MAX);
|
2016-03-30 17:48:05 +00:00
|
|
|
CLAMPCHECK(cParams.hashLog, ZSTD_HASHLOG_MIN, ZSTD_HASHLOG_MAX);
|
|
|
|
CLAMPCHECK(cParams.searchLog, ZSTD_SEARCHLOG_MIN, ZSTD_SEARCHLOG_MAX);
|
2017-03-29 23:02:47 +00:00
|
|
|
CLAMPCHECK(cParams.searchLength, ZSTD_SEARCHLENGTH_MIN, ZSTD_SEARCHLENGTH_MAX);
|
2016-03-30 17:48:05 +00:00
|
|
|
CLAMPCHECK(cParams.targetLength, ZSTD_TARGETLENGTH_MIN, ZSTD_TARGETLENGTH_MAX);
|
2017-03-09 19:44:25 +00:00
|
|
|
if ((U32)(cParams.strategy) > (U32)ZSTD_btultra) return ERROR(compressionParameter_unsupported);
|
2016-03-30 14:50:44 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-12-11 23:47:30 +00:00
|
|
|
/** ZSTD_cycleLog() :
|
|
|
|
* condition for correct operation : hashLog > 1 */
|
|
|
|
static U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat)
|
|
|
|
{
|
|
|
|
U32 const btScale = ((U32)strat >= (U32)ZSTD_btlazy2);
|
|
|
|
return hashLog - btScale;
|
|
|
|
}
|
|
|
|
|
2016-06-01 16:45:34 +00:00
|
|
|
/** ZSTD_adjustCParams() :
|
2016-09-26 14:41:05 +00:00
|
|
|
optimize `cPar` for a given input (`srcSize` and `dictSize`).
|
2016-03-30 14:50:44 +00:00
|
|
|
mostly downsizing to reduce memory consumption and initialization.
|
|
|
|
Both `srcSize` and `dictSize` are optional (use 0 if unknown),
|
|
|
|
but if both are 0, no optimization can be done.
|
2016-06-01 16:45:34 +00:00
|
|
|
Note : cPar is considered validated at this stage. Use ZSTD_checkParams() to ensure that. */
|
2016-07-07 09:53:18 +00:00
|
|
|
ZSTD_compressionParameters ZSTD_adjustCParams(ZSTD_compressionParameters cPar, unsigned long long srcSize, size_t dictSize)
|
2016-03-30 14:50:44 +00:00
|
|
|
{
|
2016-06-01 16:45:34 +00:00
|
|
|
if (srcSize+dictSize == 0) return cPar; /* no size information available : no adjustment */
|
2015-11-04 11:05:27 +00:00
|
|
|
|
2016-03-19 17:08:32 +00:00
|
|
|
/* resize params, to use less memory when necessary */
|
2016-03-30 18:06:26 +00:00
|
|
|
{ U32 const minSrcSize = (srcSize==0) ? 500 : 0;
|
|
|
|
U64 const rSize = srcSize + dictSize + minSrcSize;
|
2016-04-04 12:53:16 +00:00
|
|
|
if (rSize < ((U64)1<<ZSTD_WINDOWLOG_MAX)) {
|
2016-09-26 14:41:05 +00:00
|
|
|
U32 const srcLog = MAX(ZSTD_HASHLOG_MIN, ZSTD_highbit32((U32)(rSize)-1) + 1);
|
2016-06-01 16:45:34 +00:00
|
|
|
if (cPar.windowLog > srcLog) cPar.windowLog = srcLog;
|
2016-03-30 14:50:44 +00:00
|
|
|
} }
|
2016-06-01 16:45:34 +00:00
|
|
|
if (cPar.hashLog > cPar.windowLog) cPar.hashLog = cPar.windowLog;
|
2016-12-11 23:47:30 +00:00
|
|
|
{ U32 const cycleLog = ZSTD_cycleLog(cPar.chainLog, cPar.strategy);
|
|
|
|
if (cycleLog > cPar.windowLog) cPar.chainLog -= (cycleLog - cPar.windowLog);
|
|
|
|
}
|
2016-03-19 16:18:00 +00:00
|
|
|
|
2016-06-01 16:45:34 +00:00
|
|
|
if (cPar.windowLog < ZSTD_WINDOWLOG_ABSOLUTEMIN) cPar.windowLog = ZSTD_WINDOWLOG_ABSOLUTEMIN; /* required for frame header */
|
|
|
|
|
|
|
|
return cPar;
|
2015-11-04 11:05:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-14 15:05:38 +00:00
|
|
|
size_t ZSTD_estimateCCtxSize(ZSTD_compressionParameters cParams)
|
2016-03-19 15:09:09 +00:00
|
|
|
{
|
2017-05-19 17:51:30 +00:00
|
|
|
size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, (size_t)1 << cParams.windowLog);
|
2016-07-27 19:05:12 +00:00
|
|
|
U32 const divider = (cParams.searchLength==3) ? 3 : 4;
|
|
|
|
size_t const maxNbSeq = blockSize / divider;
|
|
|
|
size_t const tokenSpace = blockSize + 11*maxNbSeq;
|
2016-07-11 01:12:17 +00:00
|
|
|
|
2016-07-27 19:05:12 +00:00
|
|
|
size_t const chainSize = (cParams.strategy == ZSTD_fast) ? 0 : (1 << cParams.chainLog);
|
|
|
|
size_t const hSize = ((size_t)1) << cParams.hashLog;
|
|
|
|
U32 const hashLog3 = (cParams.searchLength>3) ? 0 : MIN(ZSTD_HASHLOG3_MAX, cParams.windowLog);
|
|
|
|
size_t const h3Size = ((size_t)1) << hashLog3;
|
2017-04-21 05:54:54 +00:00
|
|
|
size_t const entropySpace = hufCTable_size + litlengthCTable_size
|
2017-04-21 06:09:39 +00:00
|
|
|
+ offcodeCTable_size + matchlengthCTable_size
|
2017-04-21 06:21:19 +00:00
|
|
|
+ entropyScratchSpace_size;
|
2016-07-27 19:05:12 +00:00
|
|
|
size_t const tableSpace = (chainSize + hSize + h3Size) * sizeof(U32);
|
2016-07-11 01:12:17 +00:00
|
|
|
|
2017-05-09 00:07:59 +00:00
|
|
|
size_t const optBudget = ((MaxML+1) + (MaxLL+1) + (MaxOff+1) + (1<<Litbits))*sizeof(U32)
|
2016-07-11 01:12:17 +00:00
|
|
|
+ (ZSTD_OPT_NUM+1)*(sizeof(ZSTD_match_t) + sizeof(ZSTD_optimal_t));
|
2017-05-10 23:49:58 +00:00
|
|
|
size_t const optSpace = ((cParams.strategy == ZSTD_btopt) || (cParams.strategy == ZSTD_btultra)) ? optBudget : 0;
|
2017-05-09 00:07:59 +00:00
|
|
|
size_t const neededSpace = entropySpace + tableSpace + tokenSpace + optSpace;
|
2016-07-11 01:12:17 +00:00
|
|
|
|
|
|
|
return sizeof(ZSTD_CCtx) + neededSpace;
|
2016-03-08 11:22:11 +00:00
|
|
|
}
|
|
|
|
|
2017-05-23 20:16:00 +00:00
|
|
|
size_t ZSTD_estimateCStreamSize(ZSTD_compressionParameters cParams)
|
|
|
|
{
|
|
|
|
size_t const CCtxSize = ZSTD_estimateCCtxSize(cParams);
|
|
|
|
size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, (size_t)1 << cParams.windowLog);
|
|
|
|
size_t const inBuffSize = ((size_t)1 << cParams.windowLog) + blockSize;
|
|
|
|
size_t const outBuffSize = ZSTD_compressBound(blockSize) + 1;
|
|
|
|
size_t const streamingSize = inBuffSize + outBuffSize;
|
|
|
|
|
|
|
|
return CCtxSize + streamingSize;
|
|
|
|
}
|
|
|
|
|
2016-09-06 07:44:59 +00:00
|
|
|
|
2017-05-19 17:17:59 +00:00
|
|
|
static U32 ZSTD_equivalentParams(ZSTD_compressionParameters cParams1,
|
|
|
|
ZSTD_compressionParameters cParams2)
|
2016-09-06 07:44:59 +00:00
|
|
|
{
|
2017-05-19 17:51:30 +00:00
|
|
|
U32 bslog1 = MIN(cParams1.windowLog, ZSTD_BLOCKSIZELOG_MAX);
|
|
|
|
U32 bslog2 = MIN(cParams2.windowLog, ZSTD_BLOCKSIZELOG_MAX);
|
2017-05-19 17:17:59 +00:00
|
|
|
return (bslog1 == bslog2) /* same block size */
|
|
|
|
& (cParams1.hashLog == cParams2.hashLog)
|
|
|
|
& (cParams1.chainLog == cParams2.chainLog)
|
|
|
|
& (cParams1.strategy == cParams2.strategy) /* opt parser space */
|
|
|
|
& ((cParams1.searchLength==3) == (cParams2.searchLength==3)); /* hashlog3 space */
|
2016-09-06 07:44:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*! ZSTD_continueCCtx() :
|
|
|
|
reuse CCtx without reset (note : requires no dictionary) */
|
|
|
|
static size_t ZSTD_continueCCtx(ZSTD_CCtx* cctx, ZSTD_parameters params, U64 frameContentSize)
|
|
|
|
{
|
|
|
|
U32 const end = (U32)(cctx->nextSrc - cctx->base);
|
2017-05-23 00:06:04 +00:00
|
|
|
cctx->appliedParams = params;
|
2016-09-06 07:44:59 +00:00
|
|
|
cctx->frameContentSize = frameContentSize;
|
2017-04-12 01:34:02 +00:00
|
|
|
cctx->consumedSrcSize = 0;
|
2016-09-06 07:44:59 +00:00
|
|
|
cctx->lowLimit = end;
|
|
|
|
cctx->dictLimit = end;
|
|
|
|
cctx->nextToUpdate = end+1;
|
|
|
|
cctx->stage = ZSTDcs_init;
|
|
|
|
cctx->dictID = 0;
|
|
|
|
cctx->loadedDictEnd = 0;
|
|
|
|
{ int i; for (i=0; i<ZSTD_REP_NUM; i++) cctx->rep[i] = repStartValue[i]; }
|
2016-09-06 07:54:22 +00:00
|
|
|
cctx->seqStore.litLengthSum = 0; /* force reset of btopt stats */
|
|
|
|
XXH64_reset(&cctx->xxhState, 0);
|
2016-09-06 07:44:59 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-23 00:45:15 +00:00
|
|
|
typedef enum { ZSTDcrp_continue, ZSTDcrp_noMemset } ZSTD_compResetPolicy_e;
|
2016-09-06 07:44:59 +00:00
|
|
|
|
2017-05-23 18:18:24 +00:00
|
|
|
typedef enum { ZSTDb_not_buffered, ZSTDb_buffered } ZSTD_buffered_policy_e;
|
|
|
|
|
2017-04-18 21:08:50 +00:00
|
|
|
/*! ZSTD_resetCCtx_internal() :
|
2017-05-23 18:18:24 +00:00
|
|
|
note : `params` are assumed fully validated at this stage */
|
|
|
|
static size_t ZSTD_resetCCtx_internal(ZSTD_CCtx* zc,
|
|
|
|
ZSTD_parameters params, U64 frameContentSize,
|
|
|
|
ZSTD_compResetPolicy_e const crp,
|
|
|
|
ZSTD_buffered_policy_e const zbuff)
|
2016-09-06 07:44:59 +00:00
|
|
|
{
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_resetCCtx_internal : wlog=%u / old=%u",
|
2017-05-23 00:06:04 +00:00
|
|
|
params.cParams.windowLog, zc->appliedParams.cParams.windowLog);
|
2017-05-23 18:18:24 +00:00
|
|
|
assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
|
2017-05-08 23:08:01 +00:00
|
|
|
|
2017-05-23 00:45:15 +00:00
|
|
|
if (crp == ZSTDcrp_continue) {
|
2017-05-23 00:06:04 +00:00
|
|
|
if (ZSTD_equivalentParams(params.cParams, zc->appliedParams.cParams)) {
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_equivalentParams()==1");
|
2017-04-21 05:54:54 +00:00
|
|
|
zc->fseCTables_ready = 0;
|
|
|
|
zc->hufCTable_repeatMode = HUF_repeat_none;
|
2016-09-06 07:44:59 +00:00
|
|
|
return ZSTD_continueCCtx(zc, params, frameContentSize);
|
2017-05-23 00:45:15 +00:00
|
|
|
} }
|
2016-09-06 07:44:59 +00:00
|
|
|
|
2017-05-19 17:51:30 +00:00
|
|
|
{ size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, (size_t)1 << params.cParams.windowLog);
|
2016-09-06 07:44:59 +00:00
|
|
|
U32 const divider = (params.cParams.searchLength==3) ? 3 : 4;
|
|
|
|
size_t const maxNbSeq = blockSize / divider;
|
|
|
|
size_t const tokenSpace = blockSize + 11*maxNbSeq;
|
2017-05-23 18:18:24 +00:00
|
|
|
size_t const chainSize = (params.cParams.strategy == ZSTD_fast) ?
|
|
|
|
0 : (1 << params.cParams.chainLog);
|
2016-09-06 07:44:59 +00:00
|
|
|
size_t const hSize = ((size_t)1) << params.cParams.hashLog;
|
2017-05-23 18:18:24 +00:00
|
|
|
U32 const hashLog3 = (params.cParams.searchLength>3) ?
|
|
|
|
0 : MIN(ZSTD_HASHLOG3_MAX, params.cParams.windowLog);
|
2016-09-06 07:44:59 +00:00
|
|
|
size_t const h3Size = ((size_t)1) << hashLog3;
|
|
|
|
size_t const tableSpace = (chainSize + hSize + h3Size) * sizeof(U32);
|
2017-05-23 18:18:24 +00:00
|
|
|
size_t const buffOutSize = ZSTD_compressBound(blockSize)+1;
|
|
|
|
size_t const buffInSize = ((size_t)1 << params.cParams.windowLog) + blockSize;
|
2016-09-06 07:44:59 +00:00
|
|
|
void* ptr;
|
|
|
|
|
|
|
|
/* Check if workSpace is large enough, alloc a new one if needed */
|
2017-04-21 05:54:54 +00:00
|
|
|
{ size_t const entropySpace = hufCTable_size + litlengthCTable_size
|
2017-04-21 06:09:39 +00:00
|
|
|
+ offcodeCTable_size + matchlengthCTable_size
|
2017-04-21 06:21:19 +00:00
|
|
|
+ entropyScratchSpace_size;
|
2017-04-21 05:54:54 +00:00
|
|
|
size_t const optPotentialSpace = ((MaxML+1) + (MaxLL+1) + (MaxOff+1) + (1<<Litbits)) * sizeof(U32)
|
2017-04-21 00:28:31 +00:00
|
|
|
+ (ZSTD_OPT_NUM+1) * (sizeof(ZSTD_match_t)+sizeof(ZSTD_optimal_t));
|
2017-05-23 18:18:24 +00:00
|
|
|
size_t const optSpace = ( (params.cParams.strategy == ZSTD_btopt)
|
|
|
|
|| (params.cParams.strategy == ZSTD_btultra)) ?
|
|
|
|
optPotentialSpace : 0;
|
|
|
|
size_t const bufferSpace = (zbuff==ZSTDb_buffered) ?
|
|
|
|
buffInSize + buffOutSize : 0;
|
|
|
|
size_t const neededSpace = entropySpace + optSpace + tableSpace
|
|
|
|
+ tokenSpace + bufferSpace;
|
2017-05-23 20:16:00 +00:00
|
|
|
|
|
|
|
if (zc->workSpaceSize < neededSpace) { /* too small : resize /*/
|
2017-05-08 23:08:01 +00:00
|
|
|
DEBUGLOG(5, "Need to update workSpaceSize from %uK to %uK \n",
|
2017-05-23 20:16:00 +00:00
|
|
|
(unsigned)zc->workSpaceSize>>10,
|
|
|
|
(unsigned)neededSpace>>10);
|
|
|
|
/* static cctx : no resize, error out */
|
|
|
|
if (zc->staticSize) return ERROR(memory_allocation);
|
|
|
|
|
2017-04-06 08:25:26 +00:00
|
|
|
zc->workSpaceSize = 0;
|
2016-09-06 07:44:59 +00:00
|
|
|
ZSTD_free(zc->workSpace, zc->customMem);
|
|
|
|
zc->workSpace = ZSTD_malloc(neededSpace, zc->customMem);
|
|
|
|
if (zc->workSpace == NULL) return ERROR(memory_allocation);
|
|
|
|
zc->workSpaceSize = neededSpace;
|
2017-04-21 00:38:56 +00:00
|
|
|
ptr = zc->workSpace;
|
|
|
|
|
|
|
|
/* entropy space */
|
2017-04-21 05:54:54 +00:00
|
|
|
zc->hufCTable = (HUF_CElt*)ptr;
|
|
|
|
ptr = (char*)zc->hufCTable + hufCTable_size; /* note : HUF_CElt* is incomplete type, size is estimated via macro */
|
2017-04-21 06:03:38 +00:00
|
|
|
zc->offcodeCTable = (FSE_CTable*) ptr;
|
|
|
|
ptr = (char*)ptr + offcodeCTable_size;
|
2017-04-21 06:21:19 +00:00
|
|
|
zc->matchlengthCTable = (FSE_CTable*) ptr;
|
2017-04-21 06:03:38 +00:00
|
|
|
ptr = (char*)ptr + matchlengthCTable_size;
|
2017-04-21 06:21:19 +00:00
|
|
|
zc->litlengthCTable = (FSE_CTable*) ptr;
|
|
|
|
ptr = (char*)ptr + litlengthCTable_size;
|
|
|
|
assert(((size_t)ptr & 3) == 0); /* ensure correct alignment */
|
2017-04-26 18:39:35 +00:00
|
|
|
zc->entropyScratchSpace = (unsigned*) ptr;
|
2016-09-06 07:44:59 +00:00
|
|
|
} }
|
2016-03-19 15:09:09 +00:00
|
|
|
|
2017-04-21 00:28:31 +00:00
|
|
|
/* init params */
|
2017-05-23 00:06:04 +00:00
|
|
|
zc->appliedParams = params;
|
2017-04-21 00:28:31 +00:00
|
|
|
zc->blockSize = blockSize;
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "blockSize = %uK", (U32)blockSize>>10);
|
2017-04-21 00:28:31 +00:00
|
|
|
zc->frameContentSize = frameContentSize;
|
|
|
|
zc->consumedSrcSize = 0;
|
2016-09-06 07:44:59 +00:00
|
|
|
|
|
|
|
XXH64_reset(&zc->xxhState, 0);
|
2017-04-21 00:28:31 +00:00
|
|
|
zc->stage = ZSTDcs_init;
|
|
|
|
zc->dictID = 0;
|
|
|
|
zc->loadedDictEnd = 0;
|
2017-04-21 05:54:54 +00:00
|
|
|
zc->fseCTables_ready = 0;
|
|
|
|
zc->hufCTable_repeatMode = HUF_repeat_none;
|
2016-09-06 07:44:59 +00:00
|
|
|
zc->nextToUpdate = 1;
|
|
|
|
zc->nextSrc = NULL;
|
|
|
|
zc->base = NULL;
|
|
|
|
zc->dictBase = NULL;
|
|
|
|
zc->dictLimit = 0;
|
|
|
|
zc->lowLimit = 0;
|
|
|
|
{ int i; for (i=0; i<ZSTD_REP_NUM; i++) zc->rep[i] = repStartValue[i]; }
|
2017-04-21 00:28:31 +00:00
|
|
|
zc->hashLog3 = hashLog3;
|
|
|
|
zc->seqStore.litLengthSum = 0;
|
2016-09-06 07:44:59 +00:00
|
|
|
|
2017-04-21 06:03:38 +00:00
|
|
|
/* ensure entropy tables are close together at the beginning */
|
|
|
|
assert((void*)zc->hufCTable == zc->workSpace);
|
|
|
|
assert((char*)zc->offcodeCTable == (char*)zc->hufCTable + hufCTable_size);
|
|
|
|
assert((char*)zc->matchlengthCTable == (char*)zc->offcodeCTable + offcodeCTable_size);
|
|
|
|
assert((char*)zc->litlengthCTable == (char*)zc->matchlengthCTable + matchlengthCTable_size);
|
2017-04-26 18:39:35 +00:00
|
|
|
assert((char*)zc->entropyScratchSpace == (char*)zc->litlengthCTable + litlengthCTable_size);
|
|
|
|
ptr = (char*)zc->entropyScratchSpace + entropyScratchSpace_size;
|
2016-09-06 07:44:59 +00:00
|
|
|
|
2017-04-21 00:28:31 +00:00
|
|
|
/* opt parser space */
|
2017-03-09 19:44:25 +00:00
|
|
|
if ((params.cParams.strategy == ZSTD_btopt) || (params.cParams.strategy == ZSTD_btultra)) {
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "reserving optimal parser space");
|
2017-04-21 00:28:31 +00:00
|
|
|
assert(((size_t)ptr & 3) == 0); /* ensure ptr is properly aligned */
|
2016-09-06 07:44:59 +00:00
|
|
|
zc->seqStore.litFreq = (U32*)ptr;
|
|
|
|
zc->seqStore.litLengthFreq = zc->seqStore.litFreq + (1<<Litbits);
|
|
|
|
zc->seqStore.matchLengthFreq = zc->seqStore.litLengthFreq + (MaxLL+1);
|
|
|
|
zc->seqStore.offCodeFreq = zc->seqStore.matchLengthFreq + (MaxML+1);
|
|
|
|
ptr = zc->seqStore.offCodeFreq + (MaxOff+1);
|
|
|
|
zc->seqStore.matchTable = (ZSTD_match_t*)ptr;
|
|
|
|
ptr = zc->seqStore.matchTable + ZSTD_OPT_NUM+1;
|
|
|
|
zc->seqStore.priceTable = (ZSTD_optimal_t*)ptr;
|
|
|
|
ptr = zc->seqStore.priceTable + ZSTD_OPT_NUM+1;
|
|
|
|
}
|
2017-04-21 00:28:31 +00:00
|
|
|
|
|
|
|
/* table Space */
|
|
|
|
if (crp!=ZSTDcrp_noMemset) memset(ptr, 0, tableSpace); /* reset tables only */
|
|
|
|
assert(((size_t)ptr & 3) == 0); /* ensure ptr is properly aligned */
|
|
|
|
zc->hashTable = (U32*)(ptr);
|
|
|
|
zc->chainTable = zc->hashTable + hSize;
|
|
|
|
zc->hashTable3 = zc->chainTable + chainSize;
|
|
|
|
ptr = zc->hashTable3 + h3Size;
|
|
|
|
|
|
|
|
/* sequences storage */
|
2016-09-06 07:44:59 +00:00
|
|
|
zc->seqStore.sequencesStart = (seqDef*)ptr;
|
|
|
|
ptr = zc->seqStore.sequencesStart + maxNbSeq;
|
|
|
|
zc->seqStore.llCode = (BYTE*) ptr;
|
|
|
|
zc->seqStore.mlCode = zc->seqStore.llCode + maxNbSeq;
|
|
|
|
zc->seqStore.ofCode = zc->seqStore.mlCode + maxNbSeq;
|
|
|
|
zc->seqStore.litStart = zc->seqStore.ofCode + maxNbSeq;
|
2017-05-23 18:18:24 +00:00
|
|
|
ptr = zc->seqStore.litStart + blockSize;
|
|
|
|
|
|
|
|
/* buffers */
|
|
|
|
zc->inBuffSize = buffInSize;
|
|
|
|
zc->inBuff = (char*)ptr;
|
|
|
|
zc->outBuffSize = buffOutSize;
|
|
|
|
zc->outBuff = zc->inBuff + buffInSize;
|
2016-09-06 07:44:59 +00:00
|
|
|
|
|
|
|
return 0;
|
2016-03-04 18:17:31 +00:00
|
|
|
}
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
|
|
|
|
2017-01-19 18:32:55 +00:00
|
|
|
/* ZSTD_invalidateRepCodes() :
|
|
|
|
* ensures next compression will not use repcodes from previous block.
|
|
|
|
* Note : only works with regular variant;
|
|
|
|
* do not use with extDict variant ! */
|
|
|
|
void ZSTD_invalidateRepCodes(ZSTD_CCtx* cctx) {
|
|
|
|
int i;
|
|
|
|
for (i=0; i<ZSTD_REP_NUM; i++) cctx->rep[i] = 0;
|
|
|
|
}
|
2015-10-25 13:06:35 +00:00
|
|
|
|
2017-04-18 21:54:54 +00:00
|
|
|
|
|
|
|
/*! ZSTD_copyCCtx_internal() :
|
|
|
|
* Duplicate an existing context `srcCCtx` into another one `dstCCtx`.
|
|
|
|
* Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()).
|
|
|
|
* pledgedSrcSize=0 means "empty" if fParams.contentSizeFlag=1
|
|
|
|
* @return : 0, or an error code */
|
2017-05-23 00:06:04 +00:00
|
|
|
static size_t ZSTD_copyCCtx_internal(ZSTD_CCtx* dstCCtx,
|
|
|
|
const ZSTD_CCtx* srcCCtx,
|
|
|
|
ZSTD_frameParameters fParams,
|
|
|
|
unsigned long long pledgedSrcSize)
|
2016-01-26 14:58:49 +00:00
|
|
|
{
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_copyCCtx_internal");
|
2016-07-27 19:05:12 +00:00
|
|
|
if (srcCCtx->stage!=ZSTDcs_init) return ERROR(stage_wrong);
|
2016-01-26 14:58:49 +00:00
|
|
|
|
2016-06-02 11:04:18 +00:00
|
|
|
memcpy(&dstCCtx->customMem, &srcCCtx->customMem, sizeof(ZSTD_customMem));
|
2017-05-23 18:18:24 +00:00
|
|
|
{ ZSTD_buffered_policy_e const zbuff = srcCCtx->inBuffSize ?
|
|
|
|
ZSTDb_buffered : ZSTDb_not_buffered;
|
|
|
|
ZSTD_parameters params = srcCCtx->appliedParams;
|
2017-04-18 21:54:54 +00:00
|
|
|
params.fParams = fParams;
|
2017-05-23 18:18:24 +00:00
|
|
|
ZSTD_resetCCtx_internal(dstCCtx, params, pledgedSrcSize,
|
|
|
|
ZSTDcrp_noMemset, zbuff);
|
2017-02-09 18:50:43 +00:00
|
|
|
}
|
2016-01-26 14:58:49 +00:00
|
|
|
|
|
|
|
/* copy tables */
|
2017-05-23 00:06:04 +00:00
|
|
|
{ size_t const chainSize = (srcCCtx->appliedParams.cParams.strategy == ZSTD_fast) ? 0 : (1 << srcCCtx->appliedParams.cParams.chainLog);
|
|
|
|
size_t const hSize = (size_t)1 << srcCCtx->appliedParams.cParams.hashLog;
|
2016-07-27 19:05:12 +00:00
|
|
|
size_t const h3Size = (size_t)1 << srcCCtx->hashLog3;
|
|
|
|
size_t const tableSpace = (chainSize + hSize + h3Size) * sizeof(U32);
|
2017-04-21 00:28:31 +00:00
|
|
|
assert((U32*)dstCCtx->chainTable == (U32*)dstCCtx->hashTable + hSize); /* chainTable must follow hashTable */
|
|
|
|
assert((U32*)dstCCtx->hashTable3 == (U32*)dstCCtx->chainTable + chainSize);
|
|
|
|
memcpy(dstCCtx->hashTable, srcCCtx->hashTable, tableSpace); /* presumes all tables follow each other */
|
2016-03-19 16:18:00 +00:00
|
|
|
}
|
2016-01-26 14:58:49 +00:00
|
|
|
|
2016-05-29 03:01:04 +00:00
|
|
|
/* copy dictionary offsets */
|
2016-03-19 16:18:00 +00:00
|
|
|
dstCCtx->nextToUpdate = srcCCtx->nextToUpdate;
|
|
|
|
dstCCtx->nextToUpdate3= srcCCtx->nextToUpdate3;
|
|
|
|
dstCCtx->nextSrc = srcCCtx->nextSrc;
|
|
|
|
dstCCtx->base = srcCCtx->base;
|
|
|
|
dstCCtx->dictBase = srcCCtx->dictBase;
|
|
|
|
dstCCtx->dictLimit = srcCCtx->dictLimit;
|
|
|
|
dstCCtx->lowLimit = srcCCtx->lowLimit;
|
|
|
|
dstCCtx->loadedDictEnd= srcCCtx->loadedDictEnd;
|
2016-05-29 03:01:04 +00:00
|
|
|
dstCCtx->dictID = srcCCtx->dictID;
|
2016-01-26 14:58:49 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
/* copy entropy tables */
|
2017-04-21 05:54:54 +00:00
|
|
|
dstCCtx->fseCTables_ready = srcCCtx->fseCTables_ready;
|
|
|
|
if (srcCCtx->fseCTables_ready) {
|
2017-04-21 01:17:58 +00:00
|
|
|
memcpy(dstCCtx->litlengthCTable, srcCCtx->litlengthCTable, litlengthCTable_size);
|
|
|
|
memcpy(dstCCtx->matchlengthCTable, srcCCtx->matchlengthCTable, matchlengthCTable_size);
|
|
|
|
memcpy(dstCCtx->offcodeCTable, srcCCtx->offcodeCTable, offcodeCTable_size);
|
2016-01-27 23:18:06 +00:00
|
|
|
}
|
2017-04-21 05:54:54 +00:00
|
|
|
dstCCtx->hufCTable_repeatMode = srcCCtx->hufCTable_repeatMode;
|
|
|
|
if (srcCCtx->hufCTable_repeatMode) {
|
|
|
|
memcpy(dstCCtx->hufCTable, srcCCtx->hufCTable, hufCTable_size);
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
}
|
2016-01-26 14:58:49 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-04-18 21:54:54 +00:00
|
|
|
/*! ZSTD_copyCCtx() :
|
|
|
|
* Duplicate an existing context `srcCCtx` into another one `dstCCtx`.
|
|
|
|
* Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()).
|
|
|
|
* pledgedSrcSize==0 means "unknown".
|
|
|
|
* @return : 0, or an error code */
|
|
|
|
size_t ZSTD_copyCCtx(ZSTD_CCtx* dstCCtx, const ZSTD_CCtx* srcCCtx, unsigned long long pledgedSrcSize)
|
|
|
|
{
|
|
|
|
ZSTD_frameParameters fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
|
|
|
|
fParams.contentSizeFlag = pledgedSrcSize>0;
|
|
|
|
|
|
|
|
return ZSTD_copyCCtx_internal(dstCCtx, srcCCtx, fParams, pledgedSrcSize);
|
|
|
|
}
|
|
|
|
|
2016-01-26 14:58:49 +00:00
|
|
|
|
2016-03-20 15:20:06 +00:00
|
|
|
/*! ZSTD_reduceTable() :
|
2017-04-18 21:54:54 +00:00
|
|
|
* reduce table indexes by `reducerValue` */
|
2016-03-20 15:20:06 +00:00
|
|
|
static void ZSTD_reduceTable (U32* const table, U32 const size, U32 const reducerValue)
|
2015-11-13 10:27:46 +00:00
|
|
|
{
|
2016-03-20 15:20:06 +00:00
|
|
|
U32 u;
|
|
|
|
for (u=0 ; u < size ; u++) {
|
|
|
|
if (table[u] < reducerValue) table[u] = 0;
|
|
|
|
else table[u] -= reducerValue;
|
2015-11-13 10:27:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-20 15:20:06 +00:00
|
|
|
/*! ZSTD_reduceIndex() :
|
|
|
|
* rescale all indexes to avoid future overflow (indexes are U32) */
|
|
|
|
static void ZSTD_reduceIndex (ZSTD_CCtx* zc, const U32 reducerValue)
|
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
{ U32 const hSize = 1 << zc->appliedParams.cParams.hashLog;
|
2016-03-20 15:20:06 +00:00
|
|
|
ZSTD_reduceTable(zc->hashTable, hSize, reducerValue); }
|
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
{ U32 const chainSize = (zc->appliedParams.cParams.strategy == ZSTD_fast) ? 0 : (1 << zc->appliedParams.cParams.chainLog);
|
2016-04-04 11:49:18 +00:00
|
|
|
ZSTD_reduceTable(zc->chainTable, chainSize, reducerValue); }
|
2016-03-20 15:20:06 +00:00
|
|
|
|
2016-07-27 19:05:12 +00:00
|
|
|
{ U32 const h3Size = (zc->hashLog3) ? 1 << zc->hashLog3 : 0;
|
2016-03-20 15:20:06 +00:00
|
|
|
ZSTD_reduceTable(zc->hashTable3, h3Size, reducerValue); }
|
|
|
|
}
|
|
|
|
|
2015-11-13 10:27:46 +00:00
|
|
|
|
2016-01-28 16:56:33 +00:00
|
|
|
/*-*******************************************************
|
2015-11-11 20:38:21 +00:00
|
|
|
* Block entropic compression
|
|
|
|
*********************************************************/
|
|
|
|
|
2016-10-24 13:58:07 +00:00
|
|
|
/* See doc/zstd_compression_format.md for detailed format description */
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
size_t ZSTD_noCompressBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
2016-03-15 00:24:33 +00:00
|
|
|
if (srcSize + ZSTD_blockHeaderSize > dstCapacity) return ERROR(dstSize_tooSmall);
|
2016-07-20 12:58:49 +00:00
|
|
|
memcpy((BYTE*)dst + ZSTD_blockHeaderSize, src, srcSize);
|
|
|
|
MEM_writeLE24(dst, (U32)(srcSize << 2) + (U32)bt_raw);
|
2015-11-11 20:38:21 +00:00
|
|
|
return ZSTD_blockHeaderSize+srcSize;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
static size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
|
|
|
BYTE* const ostart = (BYTE* const)dst;
|
2016-07-27 19:05:12 +00:00
|
|
|
U32 const flSize = 1 + (srcSize>31) + (srcSize>4095);
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
if (srcSize + flSize > dstCapacity) return ERROR(dstSize_tooSmall);
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
switch(flSize)
|
|
|
|
{
|
|
|
|
case 1: /* 2 - 1 - 5 */
|
2016-07-23 14:31:49 +00:00
|
|
|
ostart[0] = (BYTE)((U32)set_basic + (srcSize<<3));
|
2016-01-23 18:28:41 +00:00
|
|
|
break;
|
|
|
|
case 2: /* 2 - 2 - 12 */
|
2016-07-23 14:31:49 +00:00
|
|
|
MEM_writeLE16(ostart, (U16)((U32)set_basic + (1<<2) + (srcSize<<4)));
|
2016-01-23 18:28:41 +00:00
|
|
|
break;
|
|
|
|
case 3: /* 2 - 2 - 20 */
|
2016-07-23 14:31:49 +00:00
|
|
|
MEM_writeLE32(ostart, (U32)((U32)set_basic + (3<<2) + (srcSize<<4)));
|
2016-01-23 18:28:41 +00:00
|
|
|
break;
|
2017-06-01 16:44:54 +00:00
|
|
|
default: /* not necessary : flSize is {1,2,3} */
|
|
|
|
assert(0);
|
2016-01-23 18:28:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(ostart + flSize, src, srcSize);
|
|
|
|
return srcSize + flSize;
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
static size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
|
|
|
BYTE* const ostart = (BYTE* const)dst;
|
2016-07-27 19:05:12 +00:00
|
|
|
U32 const flSize = 1 + (srcSize>31) + (srcSize>4095);
|
2016-01-23 18:28:41 +00:00
|
|
|
|
2016-07-20 18:12:24 +00:00
|
|
|
(void)dstCapacity; /* dstCapacity already guaranteed to be >=4, hence large enough */
|
2016-01-23 18:28:41 +00:00
|
|
|
|
|
|
|
switch(flSize)
|
|
|
|
{
|
|
|
|
case 1: /* 2 - 1 - 5 */
|
2016-07-23 14:31:49 +00:00
|
|
|
ostart[0] = (BYTE)((U32)set_rle + (srcSize<<3));
|
2016-01-23 18:28:41 +00:00
|
|
|
break;
|
|
|
|
case 2: /* 2 - 2 - 12 */
|
2016-07-23 14:31:49 +00:00
|
|
|
MEM_writeLE16(ostart, (U16)((U32)set_rle + (1<<2) + (srcSize<<4)));
|
2016-01-23 18:28:41 +00:00
|
|
|
break;
|
|
|
|
case 3: /* 2 - 2 - 20 */
|
2016-07-23 14:31:49 +00:00
|
|
|
MEM_writeLE32(ostart, (U32)((U32)set_rle + (3<<2) + (srcSize<<4)));
|
2016-01-23 18:28:41 +00:00
|
|
|
break;
|
2017-06-01 16:44:54 +00:00
|
|
|
default: /* not necessary : flSize is {1,2,3} */
|
|
|
|
assert(0);
|
2016-01-23 18:28:41 +00:00
|
|
|
}
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
ostart[flSize] = *(const BYTE*)src;
|
|
|
|
return flSize+1;
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
|
2016-03-20 00:09:18 +00:00
|
|
|
static size_t ZSTD_minGain(size_t srcSize) { return (srcSize >> 6) + 2; }
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-01-26 02:14:20 +00:00
|
|
|
static size_t ZSTD_compressLiterals (ZSTD_CCtx* zc,
|
2016-03-15 00:24:33 +00:00
|
|
|
void* dst, size_t dstCapacity,
|
2015-11-11 20:38:21 +00:00
|
|
|
const void* src, size_t srcSize)
|
|
|
|
{
|
2016-03-18 11:37:45 +00:00
|
|
|
size_t const minGain = ZSTD_minGain(srcSize);
|
|
|
|
size_t const lhSize = 3 + (srcSize >= 1 KB) + (srcSize >= 16 KB);
|
2016-07-27 19:05:12 +00:00
|
|
|
BYTE* const ostart = (BYTE*)dst;
|
2016-01-25 03:10:46 +00:00
|
|
|
U32 singleStream = srcSize < 256;
|
2016-07-23 14:31:49 +00:00
|
|
|
symbolEncodingType_e hType = set_compressed;
|
2016-03-18 11:37:45 +00:00
|
|
|
size_t cLitSize;
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
|
2016-03-20 00:09:18 +00:00
|
|
|
/* small ? don't even attempt compression (speed opt) */
|
|
|
|
# define LITERAL_NOENTROPY 63
|
2017-04-21 05:54:54 +00:00
|
|
|
{ size_t const minLitSize = zc->hufCTable_repeatMode == HUF_repeat_valid ? 6 : LITERAL_NOENTROPY;
|
2016-03-20 00:09:18 +00:00
|
|
|
if (srcSize <= minLitSize) return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dstCapacity < lhSize+1) return ERROR(dstSize_tooSmall); /* not enough space for compression */
|
2017-04-21 05:54:54 +00:00
|
|
|
{ HUF_repeat repeat = zc->hufCTable_repeatMode;
|
2017-05-23 00:06:04 +00:00
|
|
|
int const preferRepeat = zc->appliedParams.cParams.strategy < ZSTD_lazy ? srcSize <= 1024 : 0;
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
if (repeat == HUF_repeat_valid && lhSize == 3) singleStream = 1;
|
2017-04-20 18:14:13 +00:00
|
|
|
cLitSize = singleStream ? HUF_compress1X_repeat(ostart+lhSize, dstCapacity-lhSize, src, srcSize, 255, 11,
|
2017-04-26 18:39:35 +00:00
|
|
|
zc->entropyScratchSpace, entropyScratchSpace_size, zc->hufCTable, &repeat, preferRepeat)
|
2017-04-20 18:14:13 +00:00
|
|
|
: HUF_compress4X_repeat(ostart+lhSize, dstCapacity-lhSize, src, srcSize, 255, 11,
|
2017-04-26 18:39:35 +00:00
|
|
|
zc->entropyScratchSpace, entropyScratchSpace_size, zc->hufCTable, &repeat, preferRepeat);
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
if (repeat != HUF_repeat_none) { hType = set_repeat; } /* reused the existing table */
|
2017-04-21 05:54:54 +00:00
|
|
|
else { zc->hufCTable_repeatMode = HUF_repeat_check; } /* now have a table to reuse */
|
2016-01-26 02:14:20 +00:00
|
|
|
}
|
2015-11-11 20:38:21 +00:00
|
|
|
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
if ((cLitSize==0) | (cLitSize >= srcSize - minGain)) {
|
2017-04-21 05:54:54 +00:00
|
|
|
zc->hufCTable_repeatMode = HUF_repeat_none;
|
2016-03-18 11:37:45 +00:00
|
|
|
return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
}
|
|
|
|
if (cLitSize==1) {
|
2017-04-21 05:54:54 +00:00
|
|
|
zc->hufCTable_repeatMode = HUF_repeat_none;
|
2016-03-18 11:37:45 +00:00
|
|
|
return ZSTD_compressRleLiteralsBlock(dst, dstCapacity, src, srcSize);
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
}
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
/* Build header */
|
2016-01-23 18:28:41 +00:00
|
|
|
switch(lhSize)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
2016-01-23 18:28:41 +00:00
|
|
|
case 3: /* 2 - 2 - 10 - 10 */
|
2016-07-22 15:30:52 +00:00
|
|
|
{ U32 const lhc = hType + ((!singleStream) << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<14);
|
2016-07-20 18:12:24 +00:00
|
|
|
MEM_writeLE24(ostart, lhc);
|
|
|
|
break;
|
|
|
|
}
|
2016-01-23 18:28:41 +00:00
|
|
|
case 4: /* 2 - 2 - 14 - 14 */
|
2016-07-22 02:45:06 +00:00
|
|
|
{ U32 const lhc = hType + (2 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<18);
|
2016-07-20 18:12:24 +00:00
|
|
|
MEM_writeLE32(ostart, lhc);
|
|
|
|
break;
|
|
|
|
}
|
2016-01-23 18:28:41 +00:00
|
|
|
case 5: /* 2 - 2 - 18 - 18 */
|
2016-07-22 02:45:06 +00:00
|
|
|
{ U32 const lhc = hType + (3 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<22);
|
2016-07-20 18:12:24 +00:00
|
|
|
MEM_writeLE32(ostart, lhc);
|
|
|
|
ostart[4] = (BYTE)(cLitSize >> 10);
|
|
|
|
break;
|
|
|
|
}
|
2017-06-01 16:44:54 +00:00
|
|
|
default: /* not possible : lhSize is {3,4,5} */
|
|
|
|
assert(0);
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
2016-03-18 11:37:45 +00:00
|
|
|
return lhSize+cLitSize;
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
|
|
|
|
2016-07-30 11:21:41 +00:00
|
|
|
static const BYTE LL_Code[64] = { 0, 1, 2, 3, 4, 5, 6, 7,
|
|
|
|
8, 9, 10, 11, 12, 13, 14, 15,
|
|
|
|
16, 16, 17, 17, 18, 18, 19, 19,
|
|
|
|
20, 20, 20, 20, 21, 21, 21, 21,
|
|
|
|
22, 22, 22, 22, 22, 22, 22, 22,
|
|
|
|
23, 23, 23, 23, 23, 23, 23, 23,
|
|
|
|
24, 24, 24, 24, 24, 24, 24, 24,
|
|
|
|
24, 24, 24, 24, 24, 24, 24, 24 };
|
|
|
|
|
|
|
|
static const BYTE ML_Code[128] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
|
|
|
|
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
|
|
|
32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37,
|
|
|
|
38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39,
|
|
|
|
40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
|
|
|
|
41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
|
|
|
|
42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
|
|
|
|
42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42 };
|
2016-07-29 19:22:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
void ZSTD_seqToCodes(const seqStore_t* seqStorePtr)
|
2016-03-26 19:52:14 +00:00
|
|
|
{
|
2016-07-29 19:22:17 +00:00
|
|
|
BYTE const LL_deltaCode = 19;
|
|
|
|
BYTE const ML_deltaCode = 36;
|
2016-07-29 22:55:13 +00:00
|
|
|
const seqDef* const sequences = seqStorePtr->sequencesStart;
|
2016-07-29 19:22:17 +00:00
|
|
|
BYTE* const llCodeTable = seqStorePtr->llCode;
|
|
|
|
BYTE* const ofCodeTable = seqStorePtr->ofCode;
|
|
|
|
BYTE* const mlCodeTable = seqStorePtr->mlCode;
|
2016-07-29 22:55:13 +00:00
|
|
|
U32 const nbSeq = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
|
2016-07-29 19:22:17 +00:00
|
|
|
U32 u;
|
|
|
|
for (u=0; u<nbSeq; u++) {
|
|
|
|
U32 const llv = sequences[u].litLength;
|
|
|
|
U32 const mlv = sequences[u].matchLength;
|
2016-07-30 11:21:41 +00:00
|
|
|
llCodeTable[u] = (llv> 63) ? (BYTE)ZSTD_highbit32(llv) + LL_deltaCode : LL_Code[llv];
|
2016-07-29 19:22:17 +00:00
|
|
|
ofCodeTable[u] = (BYTE)ZSTD_highbit32(sequences[u].offset);
|
2016-07-30 11:21:41 +00:00
|
|
|
mlCodeTable[u] = (mlv>127) ? (BYTE)ZSTD_highbit32(mlv) + ML_deltaCode : ML_Code[mlv];
|
2016-04-07 15:19:00 +00:00
|
|
|
}
|
2016-07-29 19:22:17 +00:00
|
|
|
if (seqStorePtr->longLengthID==1)
|
|
|
|
llCodeTable[seqStorePtr->longLengthPos] = MaxLL;
|
|
|
|
if (seqStorePtr->longLengthID==2)
|
|
|
|
mlCodeTable[seqStorePtr->longLengthPos] = MaxML;
|
2016-03-26 19:52:14 +00:00
|
|
|
}
|
|
|
|
|
2017-03-02 23:15:31 +00:00
|
|
|
MEM_STATIC size_t ZSTD_compressSequences (ZSTD_CCtx* zc,
|
2016-03-15 00:24:33 +00:00
|
|
|
void* dst, size_t dstCapacity,
|
2017-03-02 23:15:31 +00:00
|
|
|
size_t srcSize)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
const int longOffsets = zc->appliedParams.cParams.windowLog > STREAM_ACCUMULATOR_MIN;
|
2016-01-26 02:14:20 +00:00
|
|
|
const seqStore_t* seqStorePtr = &(zc->seqStore);
|
2015-11-11 20:38:21 +00:00
|
|
|
U32 count[MaxSeq+1];
|
|
|
|
S16 norm[MaxSeq+1];
|
2016-01-27 23:18:06 +00:00
|
|
|
FSE_CTable* CTable_LitLength = zc->litlengthCTable;
|
|
|
|
FSE_CTable* CTable_OffsetBits = zc->offcodeCTable;
|
|
|
|
FSE_CTable* CTable_MatchLength = zc->matchlengthCTable;
|
2015-11-11 20:38:21 +00:00
|
|
|
U32 LLtype, Offtype, MLtype; /* compressed, raw or rle */
|
2016-07-29 22:55:13 +00:00
|
|
|
const seqDef* const sequences = seqStorePtr->sequencesStart;
|
2016-07-29 19:22:17 +00:00
|
|
|
const BYTE* const ofCodeTable = seqStorePtr->ofCode;
|
|
|
|
const BYTE* const llCodeTable = seqStorePtr->llCode;
|
|
|
|
const BYTE* const mlCodeTable = seqStorePtr->mlCode;
|
2015-11-23 12:34:21 +00:00
|
|
|
BYTE* const ostart = (BYTE*)dst;
|
2016-03-15 00:24:33 +00:00
|
|
|
BYTE* const oend = ostart + dstCapacity;
|
2016-03-18 11:37:45 +00:00
|
|
|
BYTE* op = ostart;
|
2016-07-29 22:55:13 +00:00
|
|
|
size_t const nbSeq = seqStorePtr->sequences - seqStorePtr->sequencesStart;
|
2015-11-11 20:38:21 +00:00
|
|
|
BYTE* seqHead;
|
2016-11-30 23:52:20 +00:00
|
|
|
BYTE scratchBuffer[1<<MAX(MLFSELog,LLFSELog)];
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
/* Compress literals */
|
2016-03-20 00:09:18 +00:00
|
|
|
{ const BYTE* const literals = seqStorePtr->litStart;
|
2016-03-18 11:37:45 +00:00
|
|
|
size_t const litSize = seqStorePtr->lit - literals;
|
2016-03-20 00:09:18 +00:00
|
|
|
size_t const cSize = ZSTD_compressLiterals(zc, op, dstCapacity, literals, litSize);
|
2015-11-11 20:38:21 +00:00
|
|
|
if (ZSTD_isError(cSize)) return cSize;
|
|
|
|
op += cSize;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sequences Header */
|
2016-03-23 21:31:57 +00:00
|
|
|
if ((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead */) return ERROR(dstSize_tooSmall);
|
2016-03-04 13:45:31 +00:00
|
|
|
if (nbSeq < 0x7F) *op++ = (BYTE)nbSeq;
|
|
|
|
else if (nbSeq < LONGNBSEQ) op[0] = (BYTE)((nbSeq>>8) + 0x80), op[1] = (BYTE)nbSeq, op+=2;
|
|
|
|
else op[0]=0xFF, MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ)), op+=3;
|
2016-01-30 23:58:06 +00:00
|
|
|
if (nbSeq==0) goto _check_compressibility;
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-03-22 22:19:28 +00:00
|
|
|
/* seqHead : flags for FSE encoding type */
|
|
|
|
seqHead = op++;
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
#define MIN_SEQ_FOR_DYNAMIC_FSE 64
|
|
|
|
#define MAX_SEQ_FOR_STATIC_FSE 1000
|
|
|
|
|
2016-03-26 19:52:14 +00:00
|
|
|
/* convert length/distances into codes */
|
2016-07-29 19:22:17 +00:00
|
|
|
ZSTD_seqToCodes(seqStorePtr);
|
2016-03-20 18:14:22 +00:00
|
|
|
|
2015-11-11 20:38:21 +00:00
|
|
|
/* CTable for Literal Lengths */
|
2016-03-22 11:14:26 +00:00
|
|
|
{ U32 max = MaxLL;
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const mostFrequent = FSE_countFast_wksp(count, &max, llCodeTable, nbSeq, zc->entropyScratchSpace);
|
2016-03-22 11:14:26 +00:00
|
|
|
if ((mostFrequent == nbSeq) && (nbSeq > 2)) {
|
|
|
|
*op++ = llCodeTable[0];
|
|
|
|
FSE_buildCTable_rle(CTable_LitLength, (BYTE)max);
|
2016-07-23 14:31:49 +00:00
|
|
|
LLtype = set_rle;
|
2017-04-21 05:54:54 +00:00
|
|
|
} else if ((zc->fseCTables_ready) && (nbSeq < MAX_SEQ_FOR_STATIC_FSE)) {
|
2016-07-23 14:31:49 +00:00
|
|
|
LLtype = set_repeat;
|
2016-03-22 11:14:26 +00:00
|
|
|
} else if ((nbSeq < MIN_SEQ_FOR_DYNAMIC_FSE) || (mostFrequent < (nbSeq >> (LL_defaultNormLog-1)))) {
|
2016-11-30 23:52:20 +00:00
|
|
|
FSE_buildCTable_wksp(CTable_LitLength, LL_defaultNorm, MaxLL, LL_defaultNormLog, scratchBuffer, sizeof(scratchBuffer));
|
2016-07-23 14:31:49 +00:00
|
|
|
LLtype = set_basic;
|
2016-03-22 11:14:26 +00:00
|
|
|
} else {
|
|
|
|
size_t nbSeq_1 = nbSeq;
|
|
|
|
const U32 tableLog = FSE_optimalTableLog(LLFSELog, nbSeq, max);
|
|
|
|
if (count[llCodeTable[nbSeq-1]]>1) { count[llCodeTable[nbSeq-1]]--; nbSeq_1--; }
|
|
|
|
FSE_normalizeCount(norm, tableLog, count, nbSeq_1, max);
|
2016-03-23 00:32:41 +00:00
|
|
|
{ size_t const NCountSize = FSE_writeNCount(op, oend-op, norm, max, tableLog); /* overflow protected */
|
2017-03-24 00:59:50 +00:00
|
|
|
if (FSE_isError(NCountSize)) return NCountSize;
|
2016-03-23 00:32:41 +00:00
|
|
|
op += NCountSize; }
|
2016-11-30 23:52:20 +00:00
|
|
|
FSE_buildCTable_wksp(CTable_LitLength, norm, max, tableLog, scratchBuffer, sizeof(scratchBuffer));
|
2016-07-23 14:31:49 +00:00
|
|
|
LLtype = set_compressed;
|
2016-03-22 11:14:26 +00:00
|
|
|
} }
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-03-26 19:52:14 +00:00
|
|
|
/* CTable for Offsets */
|
2016-03-22 11:14:26 +00:00
|
|
|
{ U32 max = MaxOff;
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const mostFrequent = FSE_countFast_wksp(count, &max, ofCodeTable, nbSeq, zc->entropyScratchSpace);
|
2016-03-22 11:14:26 +00:00
|
|
|
if ((mostFrequent == nbSeq) && (nbSeq > 2)) {
|
2016-03-23 21:31:57 +00:00
|
|
|
*op++ = ofCodeTable[0];
|
2016-03-22 11:14:26 +00:00
|
|
|
FSE_buildCTable_rle(CTable_OffsetBits, (BYTE)max);
|
2016-07-23 14:31:49 +00:00
|
|
|
Offtype = set_rle;
|
2017-04-21 05:54:54 +00:00
|
|
|
} else if ((zc->fseCTables_ready) && (nbSeq < MAX_SEQ_FOR_STATIC_FSE)) {
|
2016-07-23 14:31:49 +00:00
|
|
|
Offtype = set_repeat;
|
2016-04-07 13:24:29 +00:00
|
|
|
} else if ((nbSeq < MIN_SEQ_FOR_DYNAMIC_FSE) || (mostFrequent < (nbSeq >> (OF_defaultNormLog-1)))) {
|
2016-11-30 23:52:20 +00:00
|
|
|
FSE_buildCTable_wksp(CTable_OffsetBits, OF_defaultNorm, MaxOff, OF_defaultNormLog, scratchBuffer, sizeof(scratchBuffer));
|
2016-07-23 14:31:49 +00:00
|
|
|
Offtype = set_basic;
|
2016-03-22 11:14:26 +00:00
|
|
|
} else {
|
|
|
|
size_t nbSeq_1 = nbSeq;
|
|
|
|
const U32 tableLog = FSE_optimalTableLog(OffFSELog, nbSeq, max);
|
2016-03-23 21:31:57 +00:00
|
|
|
if (count[ofCodeTable[nbSeq-1]]>1) { count[ofCodeTable[nbSeq-1]]--; nbSeq_1--; }
|
2016-03-22 11:14:26 +00:00
|
|
|
FSE_normalizeCount(norm, tableLog, count, nbSeq_1, max);
|
2016-03-23 00:32:41 +00:00
|
|
|
{ size_t const NCountSize = FSE_writeNCount(op, oend-op, norm, max, tableLog); /* overflow protected */
|
2017-03-24 00:59:50 +00:00
|
|
|
if (FSE_isError(NCountSize)) return NCountSize;
|
2016-03-23 00:32:41 +00:00
|
|
|
op += NCountSize; }
|
2016-11-30 23:52:20 +00:00
|
|
|
FSE_buildCTable_wksp(CTable_OffsetBits, norm, max, tableLog, scratchBuffer, sizeof(scratchBuffer));
|
2016-07-23 14:31:49 +00:00
|
|
|
Offtype = set_compressed;
|
2016-03-22 11:14:26 +00:00
|
|
|
} }
|
|
|
|
|
2015-11-11 20:38:21 +00:00
|
|
|
/* CTable for MatchLengths */
|
2016-03-22 11:14:26 +00:00
|
|
|
{ U32 max = MaxML;
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const mostFrequent = FSE_countFast_wksp(count, &max, mlCodeTable, nbSeq, zc->entropyScratchSpace);
|
2016-03-22 11:14:26 +00:00
|
|
|
if ((mostFrequent == nbSeq) && (nbSeq > 2)) {
|
2016-03-23 19:44:12 +00:00
|
|
|
*op++ = *mlCodeTable;
|
2016-03-22 11:14:26 +00:00
|
|
|
FSE_buildCTable_rle(CTable_MatchLength, (BYTE)max);
|
2016-07-23 14:31:49 +00:00
|
|
|
MLtype = set_rle;
|
2017-04-21 05:54:54 +00:00
|
|
|
} else if ((zc->fseCTables_ready) && (nbSeq < MAX_SEQ_FOR_STATIC_FSE)) {
|
2016-07-23 14:31:49 +00:00
|
|
|
MLtype = set_repeat;
|
2016-03-22 11:14:26 +00:00
|
|
|
} else if ((nbSeq < MIN_SEQ_FOR_DYNAMIC_FSE) || (mostFrequent < (nbSeq >> (ML_defaultNormLog-1)))) {
|
2016-11-30 23:52:20 +00:00
|
|
|
FSE_buildCTable_wksp(CTable_MatchLength, ML_defaultNorm, MaxML, ML_defaultNormLog, scratchBuffer, sizeof(scratchBuffer));
|
2016-07-23 14:31:49 +00:00
|
|
|
MLtype = set_basic;
|
2016-03-22 11:14:26 +00:00
|
|
|
} else {
|
|
|
|
size_t nbSeq_1 = nbSeq;
|
|
|
|
const U32 tableLog = FSE_optimalTableLog(MLFSELog, nbSeq, max);
|
|
|
|
if (count[mlCodeTable[nbSeq-1]]>1) { count[mlCodeTable[nbSeq-1]]--; nbSeq_1--; }
|
|
|
|
FSE_normalizeCount(norm, tableLog, count, nbSeq_1, max);
|
|
|
|
{ size_t const NCountSize = FSE_writeNCount(op, oend-op, norm, max, tableLog); /* overflow protected */
|
2017-03-24 00:59:50 +00:00
|
|
|
if (FSE_isError(NCountSize)) return NCountSize;
|
2016-03-22 11:14:26 +00:00
|
|
|
op += NCountSize; }
|
2016-11-30 23:52:20 +00:00
|
|
|
FSE_buildCTable_wksp(CTable_MatchLength, norm, max, tableLog, scratchBuffer, sizeof(scratchBuffer));
|
2016-07-23 14:31:49 +00:00
|
|
|
MLtype = set_compressed;
|
2016-03-22 11:14:26 +00:00
|
|
|
} }
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-03-22 22:19:28 +00:00
|
|
|
*seqHead = (BYTE)((LLtype<<6) + (Offtype<<4) + (MLtype<<2));
|
2017-04-21 05:54:54 +00:00
|
|
|
zc->fseCTables_ready = 0;
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
/* Encoding Sequences */
|
2016-03-19 17:08:32 +00:00
|
|
|
{ BIT_CStream_t blockStream;
|
2016-03-18 11:37:45 +00:00
|
|
|
FSE_CState_t stateMatchLength;
|
|
|
|
FSE_CState_t stateOffsetBits;
|
|
|
|
FSE_CState_t stateLitLength;
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-09-06 14:38:51 +00:00
|
|
|
CHECK_E(BIT_initCStream(&blockStream, op, oend-op), dstSize_tooSmall); /* not enough space remaining */
|
2016-03-20 18:14:22 +00:00
|
|
|
|
|
|
|
/* first symbols */
|
2016-03-22 11:14:26 +00:00
|
|
|
FSE_initCState2(&stateMatchLength, CTable_MatchLength, mlCodeTable[nbSeq-1]);
|
2016-03-23 21:31:57 +00:00
|
|
|
FSE_initCState2(&stateOffsetBits, CTable_OffsetBits, ofCodeTable[nbSeq-1]);
|
2016-03-20 18:14:22 +00:00
|
|
|
FSE_initCState2(&stateLitLength, CTable_LitLength, llCodeTable[nbSeq-1]);
|
2016-07-29 19:22:17 +00:00
|
|
|
BIT_addBits(&blockStream, sequences[nbSeq-1].litLength, LL_bits[llCodeTable[nbSeq-1]]);
|
2016-03-26 16:18:11 +00:00
|
|
|
if (MEM_32bits()) BIT_flushBits(&blockStream);
|
2016-07-29 19:22:17 +00:00
|
|
|
BIT_addBits(&blockStream, sequences[nbSeq-1].matchLength, ML_bits[mlCodeTable[nbSeq-1]]);
|
2016-03-26 16:18:11 +00:00
|
|
|
if (MEM_32bits()) BIT_flushBits(&blockStream);
|
2017-03-01 22:36:25 +00:00
|
|
|
if (longOffsets) {
|
|
|
|
U32 const ofBits = ofCodeTable[nbSeq-1];
|
|
|
|
int const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1);
|
|
|
|
if (extraBits) {
|
|
|
|
BIT_addBits(&blockStream, sequences[nbSeq-1].offset, extraBits);
|
|
|
|
BIT_flushBits(&blockStream);
|
|
|
|
}
|
|
|
|
BIT_addBits(&blockStream, sequences[nbSeq-1].offset >> extraBits,
|
|
|
|
ofBits - extraBits);
|
|
|
|
} else {
|
|
|
|
BIT_addBits(&blockStream, sequences[nbSeq-1].offset, ofCodeTable[nbSeq-1]);
|
|
|
|
}
|
2016-03-20 18:14:22 +00:00
|
|
|
BIT_flushBits(&blockStream);
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-03-22 11:14:26 +00:00
|
|
|
{ size_t n;
|
|
|
|
for (n=nbSeq-2 ; n<nbSeq ; n--) { /* intentional underflow */
|
2016-07-30 01:20:47 +00:00
|
|
|
BYTE const llCode = llCodeTable[n];
|
2016-07-27 19:05:12 +00:00
|
|
|
BYTE const ofCode = ofCodeTable[n];
|
|
|
|
BYTE const mlCode = mlCodeTable[n];
|
|
|
|
U32 const llBits = LL_bits[llCode];
|
|
|
|
U32 const ofBits = ofCode; /* 32b*/ /* 64b*/
|
2016-07-30 01:20:47 +00:00
|
|
|
U32 const mlBits = ML_bits[mlCode];
|
2016-03-22 11:14:26 +00:00
|
|
|
/* (7)*/ /* (7)*/
|
2016-03-26 16:18:11 +00:00
|
|
|
FSE_encodeSymbol(&blockStream, &stateOffsetBits, ofCode); /* 15 */ /* 15 */
|
|
|
|
FSE_encodeSymbol(&blockStream, &stateMatchLength, mlCode); /* 24 */ /* 24 */
|
|
|
|
if (MEM_32bits()) BIT_flushBits(&blockStream); /* (7)*/
|
|
|
|
FSE_encodeSymbol(&blockStream, &stateLitLength, llCode); /* 16 */ /* 33 */
|
2016-04-11 14:25:56 +00:00
|
|
|
if (MEM_32bits() || (ofBits+mlBits+llBits >= 64-7-(LLFSELog+MLFSELog+OffFSELog)))
|
2016-03-26 16:18:11 +00:00
|
|
|
BIT_flushBits(&blockStream); /* (7)*/
|
2016-07-29 19:22:17 +00:00
|
|
|
BIT_addBits(&blockStream, sequences[n].litLength, llBits);
|
2016-03-26 16:18:11 +00:00
|
|
|
if (MEM_32bits() && ((llBits+mlBits)>24)) BIT_flushBits(&blockStream);
|
2016-07-29 19:22:17 +00:00
|
|
|
BIT_addBits(&blockStream, sequences[n].matchLength, mlBits);
|
2016-03-26 16:18:11 +00:00
|
|
|
if (MEM_32bits()) BIT_flushBits(&blockStream); /* (7)*/
|
2017-03-01 22:36:25 +00:00
|
|
|
if (longOffsets) {
|
|
|
|
int const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1);
|
|
|
|
if (extraBits) {
|
|
|
|
BIT_addBits(&blockStream, sequences[n].offset, extraBits);
|
|
|
|
BIT_flushBits(&blockStream); /* (7)*/
|
|
|
|
}
|
|
|
|
BIT_addBits(&blockStream, sequences[n].offset >> extraBits,
|
|
|
|
ofBits - extraBits); /* 31 */
|
|
|
|
} else {
|
|
|
|
BIT_addBits(&blockStream, sequences[n].offset, ofBits); /* 31 */
|
|
|
|
}
|
2016-03-26 16:18:11 +00:00
|
|
|
BIT_flushBits(&blockStream); /* (7)*/
|
2016-03-22 11:14:26 +00:00
|
|
|
} }
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
FSE_flushCState(&blockStream, &stateMatchLength);
|
|
|
|
FSE_flushCState(&blockStream, &stateOffsetBits);
|
|
|
|
FSE_flushCState(&blockStream, &stateLitLength);
|
|
|
|
|
2016-03-26 16:18:11 +00:00
|
|
|
{ size_t const streamSize = BIT_closeCStream(&blockStream);
|
|
|
|
if (streamSize==0) return ERROR(dstSize_tooSmall); /* not enough space */
|
|
|
|
op += streamSize;
|
|
|
|
} }
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
/* check compressibility */
|
2016-01-30 23:58:06 +00:00
|
|
|
_check_compressibility:
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
{ size_t const minGain = ZSTD_minGain(srcSize);
|
|
|
|
size_t const maxCSize = srcSize - minGain;
|
|
|
|
if ((size_t)(op-ostart) >= maxCSize) {
|
2017-04-21 05:54:54 +00:00
|
|
|
zc->hufCTable_repeatMode = HUF_repeat_none;
|
Allow compressor to repeat Huffman tables
* Compressor saves most recently used Huffman table and reuses it
if it produces better results.
* I attempted to preserve CPU usage profile.
I intentionally left all of the existing heuristics in place.
There is only a speed difference on the second block and later.
When compressing large enough blocks (say >= 4 KiB) there is
no significant difference in compression speed.
Dictionary compression of one block is the same speed for blocks
with literals <= 1 KiB, and after that the difference is not
very significant.
* In the synthetic data, with blocks 10 KB or smaller, most blocks
can't use repeated tables because the previous block did not
contain a symbol that the current block contains.
Once blocks are about 12 KB or more, most previous blocks have
valid Huffman tables for the current block, and the compression
ratio and decompression speed jumped.
* In silesia blocks as small as 4KB can frequently reuse the
previous Huffman table (85%), but it isn't as profitable, and
the previous Huffman table only gets used about 3% of the time.
* Microbenchmarks show that `HUF_validateCTable()` takes ~55 ns
and `HUF_estimateCompressedSize()` takes ~35 ns.
They are decently well optimized, the first versions took 90 ns
and 120 ns respectively. `HUF_validateCTable()` could be twice as
fast, if we cast the `HUF_CElt*` to a `U32*` and compare to 0.
However, `U32` has an alignment of 4 instead of 2, so I think that
might be undefined behavior.
* I've ran `zstreamtest` compiled normally, with UASAN and with MSAN
for 4 hours each.
The worst case for the speed difference is a bunch of small blocks
in the same frame. I modified `bench.c` to compress the input in a
single frame but with blocks of the given block size, set by `-B`.
Benchmarks on level 1:
| Program | Block size | Corpus | Ratio | Compression MB/s | Decompression MB/s |
|-----------|------------|-----------|-------|------------------|--------------------|
| zstd.base | 256 | synthetic | 2.364 | 110.0 | 297.0 |
| zstd | 256 | synthetic | 2.367 | 108.9 | 297.0 |
| zstd.base | 256 | silesia | 2.204 | 93.8 | 415.7 |
| zstd | 256 | silesia | 2.204 | 93.4 | 415.7 |
| zstd.base | 512 | synthetic | 2.594 | 144.2 | 420.0 |
| zstd | 512 | synthetic | 2.599 | 141.5 | 425.7 |
| zstd.base | 512 | silesia | 2.358 | 118.4 | 432.6 |
| zstd | 512 | silesia | 2.358 | 119.8 | 432.6 |
| zstd.base | 1024 | synthetic | 2.790 | 192.3 | 594.1 |
| zstd | 1024 | synthetic | 2.794 | 192.3 | 600.0 |
| zstd.base | 1024 | silesia | 2.524 | 148.2 | 464.2 |
| zstd | 1024 | silesia | 2.525 | 148.2 | 467.6 |
| zstd.base | 4096 | synthetic | 3.023 | 300.0 | 1000.0 |
| zstd | 4096 | synthetic | 3.024 | 300.0 | 1010.1 |
| zstd.base | 4096 | silesia | 2.779 | 223.1 | 623.5 |
| zstd | 4096 | silesia | 2.779 | 223.1 | 636.0 |
| zstd.base | 16384 | synthetic | 3.131 | 350.0 | 1150.1 |
| zstd | 16384 | synthetic | 3.152 | 350.0 | 1630.3 |
| zstd.base | 16384 | silesia | 2.871 | 296.5 | 883.3 |
| zstd | 16384 | silesia | 2.872 | 294.4 | 898.3 |
2017-03-02 01:51:56 +00:00
|
|
|
return 0;
|
|
|
|
} }
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-06-13 23:49:25 +00:00
|
|
|
/* confirm repcodes */
|
2017-01-20 01:33:37 +00:00
|
|
|
{ int i; for (i=0; i<ZSTD_REP_NUM; i++) zc->rep[i] = zc->repToConfirm[i]; }
|
2016-06-13 23:49:25 +00:00
|
|
|
|
2015-11-23 12:34:21 +00:00
|
|
|
return op - ostart;
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
|
|
|
|
2017-01-26 00:25:38 +00:00
|
|
|
|
2016-03-08 17:24:21 +00:00
|
|
|
/*! ZSTD_storeSeq() :
|
|
|
|
Store a sequence (literal length, literals, offset code and match length code) into seqStore_t.
|
|
|
|
`offsetCode` : distance to match, or 0 == repCode.
|
|
|
|
`matchCode` : matchLength - MINMATCH
|
2015-11-11 20:38:21 +00:00
|
|
|
*/
|
2016-07-02 23:48:26 +00:00
|
|
|
MEM_STATIC void ZSTD_storeSeq(seqStore_t* seqStorePtr, size_t litLength, const void* literals, U32 offsetCode, size_t matchCode)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
2017-05-19 17:17:59 +00:00
|
|
|
#if defined(ZSTD_DEBUG) && (ZSTD_DEBUG >= 6)
|
|
|
|
static const BYTE* g_start = NULL;
|
|
|
|
U32 const pos = (U32)((const BYTE*)literals - g_start);
|
|
|
|
if (g_start==NULL) g_start = (const BYTE*)literals;
|
|
|
|
if ((pos > 0) && (pos < 1000000000))
|
|
|
|
DEBUGLOG(6, "Cpos %6u :%5u literals & match %3u bytes at distance %6u",
|
|
|
|
pos, (U32)litLength, (U32)matchCode+MINMATCH, (U32)offsetCode);
|
2015-11-11 20:38:21 +00:00
|
|
|
#endif
|
|
|
|
/* copy Literals */
|
2017-05-19 17:17:59 +00:00
|
|
|
assert(seqStorePtr->lit + litLength <= seqStorePtr->litStart + 128 KB);
|
2015-11-11 20:38:21 +00:00
|
|
|
ZSTD_wildcopy(seqStorePtr->lit, literals, litLength);
|
|
|
|
seqStorePtr->lit += litLength;
|
|
|
|
|
|
|
|
/* literal Length */
|
2017-04-21 00:28:31 +00:00
|
|
|
if (litLength>0xFFFF) {
|
|
|
|
seqStorePtr->longLengthID = 1;
|
|
|
|
seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
|
|
|
|
}
|
2016-07-29 22:55:13 +00:00
|
|
|
seqStorePtr->sequences[0].litLength = (U16)litLength;
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
/* match offset */
|
2016-07-29 22:55:13 +00:00
|
|
|
seqStorePtr->sequences[0].offset = offsetCode + 1;
|
2015-11-11 20:38:21 +00:00
|
|
|
|
|
|
|
/* match Length */
|
2017-04-21 00:28:31 +00:00
|
|
|
if (matchCode>0xFFFF) {
|
|
|
|
seqStorePtr->longLengthID = 2;
|
|
|
|
seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
|
|
|
|
}
|
2016-07-29 22:55:13 +00:00
|
|
|
seqStorePtr->sequences[0].matchLength = (U16)matchCode;
|
2016-07-29 19:22:17 +00:00
|
|
|
|
2016-07-29 22:55:13 +00:00
|
|
|
seqStorePtr->sequences++;
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-11 23:07:30 +00:00
|
|
|
/*-*************************************
|
2015-11-11 20:38:21 +00:00
|
|
|
* Match length counter
|
|
|
|
***************************************/
|
2015-11-23 12:34:21 +00:00
|
|
|
static unsigned ZSTD_NbCommonBytes (register size_t val)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
2016-01-28 16:56:33 +00:00
|
|
|
if (MEM_isLittleEndian()) {
|
|
|
|
if (MEM_64bits()) {
|
2015-11-11 20:38:21 +00:00
|
|
|
# if defined(_MSC_VER) && defined(_WIN64)
|
|
|
|
unsigned long r = 0;
|
|
|
|
_BitScanForward64( &r, (U64)val );
|
2015-12-09 08:05:22 +00:00
|
|
|
return (unsigned)(r>>3);
|
2015-11-11 20:38:21 +00:00
|
|
|
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
|
|
return (__builtin_ctzll((U64)val) >> 3);
|
|
|
|
# else
|
2017-04-20 18:14:13 +00:00
|
|
|
static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2,
|
|
|
|
0, 3, 1, 3, 1, 4, 2, 7,
|
|
|
|
0, 2, 3, 6, 1, 5, 3, 5,
|
|
|
|
1, 3, 4, 4, 2, 5, 6, 7,
|
|
|
|
7, 0, 1, 2, 3, 3, 4, 6,
|
|
|
|
2, 6, 5, 5, 3, 4, 5, 6,
|
|
|
|
7, 1, 2, 4, 6, 4, 4, 5,
|
|
|
|
7, 2, 6, 5, 7, 6, 7, 7 };
|
2015-11-11 20:38:21 +00:00
|
|
|
return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
|
|
|
|
# endif
|
2016-01-28 16:56:33 +00:00
|
|
|
} else { /* 32 bits */
|
2015-11-11 20:38:21 +00:00
|
|
|
# if defined(_MSC_VER)
|
|
|
|
unsigned long r=0;
|
|
|
|
_BitScanForward( &r, (U32)val );
|
2015-12-09 08:05:22 +00:00
|
|
|
return (unsigned)(r>>3);
|
2015-11-11 20:38:21 +00:00
|
|
|
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
|
|
return (__builtin_ctz((U32)val) >> 3);
|
|
|
|
# else
|
2017-04-20 18:14:13 +00:00
|
|
|
static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0,
|
|
|
|
3, 2, 2, 1, 3, 2, 0, 1,
|
|
|
|
3, 3, 1, 2, 2, 2, 2, 0,
|
|
|
|
3, 1, 2, 0, 1, 0, 1, 1 };
|
2015-11-11 20:38:21 +00:00
|
|
|
return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
|
|
|
|
# endif
|
|
|
|
}
|
2016-01-28 16:56:33 +00:00
|
|
|
} else { /* Big Endian CPU */
|
|
|
|
if (MEM_64bits()) {
|
2015-11-11 20:38:21 +00:00
|
|
|
# if defined(_MSC_VER) && defined(_WIN64)
|
|
|
|
unsigned long r = 0;
|
|
|
|
_BitScanReverse64( &r, val );
|
|
|
|
return (unsigned)(r>>3);
|
|
|
|
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
|
|
return (__builtin_clzll(val) >> 3);
|
|
|
|
# else
|
|
|
|
unsigned r;
|
|
|
|
const unsigned n32 = sizeof(size_t)*4; /* calculate this way due to compiler complaining in 32-bits mode */
|
|
|
|
if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
|
|
|
|
if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
|
|
|
|
r += (!val);
|
|
|
|
return r;
|
|
|
|
# endif
|
2016-01-28 16:56:33 +00:00
|
|
|
} else { /* 32 bits */
|
2015-11-11 20:38:21 +00:00
|
|
|
# if defined(_MSC_VER)
|
|
|
|
unsigned long r = 0;
|
|
|
|
_BitScanReverse( &r, (unsigned long)val );
|
|
|
|
return (unsigned)(r>>3);
|
|
|
|
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
|
|
return (__builtin_clz((U32)val) >> 3);
|
|
|
|
# else
|
|
|
|
unsigned r;
|
|
|
|
if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
|
|
|
|
r += (!val);
|
|
|
|
return r;
|
|
|
|
# endif
|
2016-01-28 16:56:33 +00:00
|
|
|
} }
|
2015-11-11 20:38:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-06-20 21:34:04 +00:00
|
|
|
static size_t ZSTD_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* const pInLimit)
|
2015-11-11 20:38:21 +00:00
|
|
|
{
|
|
|
|
const BYTE* const pStart = pIn;
|
2016-06-20 21:34:04 +00:00
|
|
|
const BYTE* const pInLoopLimit = pInLimit - (sizeof(size_t)-1);
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-06-20 21:34:04 +00:00
|
|
|
while (pIn < pInLoopLimit) {
|
2016-05-20 09:44:43 +00:00
|
|
|
size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn);
|
2015-11-11 20:38:21 +00:00
|
|
|
if (!diff) { pIn+=sizeof(size_t); pMatch+=sizeof(size_t); continue; }
|
|
|
|
pIn += ZSTD_NbCommonBytes(diff);
|
|
|
|
return (size_t)(pIn - pStart);
|
|
|
|
}
|
|
|
|
if (MEM_64bits()) if ((pIn<(pInLimit-3)) && (MEM_read32(pMatch) == MEM_read32(pIn))) { pIn+=4; pMatch+=4; }
|
|
|
|
if ((pIn<(pInLimit-1)) && (MEM_read16(pMatch) == MEM_read16(pIn))) { pIn+=2; pMatch+=2; }
|
|
|
|
if ((pIn<pInLimit) && (*pMatch == *pIn)) pIn++;
|
|
|
|
return (size_t)(pIn - pStart);
|
|
|
|
}
|
|
|
|
|
2016-02-11 05:23:24 +00:00
|
|
|
/** ZSTD_count_2segments() :
|
2016-02-11 23:07:30 +00:00
|
|
|
* can count match length with `ip` & `match` in 2 different segments.
|
2015-11-23 12:34:21 +00:00
|
|
|
* convention : on reaching mEnd, match count continue starting from iStart
|
|
|
|
*/
|
|
|
|
static size_t ZSTD_count_2segments(const BYTE* ip, const BYTE* match, const BYTE* iEnd, const BYTE* mEnd, const BYTE* iStart)
|
|
|
|
{
|
2016-05-20 09:44:43 +00:00
|
|
|
const BYTE* const vEnd = MIN( ip + (mEnd - match), iEnd);
|
2016-07-27 19:05:12 +00:00
|
|
|
size_t const matchLength = ZSTD_count(ip, match, vEnd);
|
|
|
|
if (match + matchLength != mEnd) return matchLength;
|
|
|
|
return matchLength + ZSTD_count(ip+matchLength, iStart, iEnd);
|
2015-11-23 12:34:21 +00:00
|
|
|
}
|
|
|
|
|
2015-11-11 20:38:21 +00:00
|
|
|
|
2016-01-28 16:56:33 +00:00
|
|
|
/*-*************************************
|
2015-11-11 20:38:21 +00:00
|
|
|
* Hashes
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2016-02-19 09:09:35 +00:00
|
|
|
static const U32 prime3bytes = 506832829U;
|
|
|
|
static U32 ZSTD_hash3(U32 u, U32 h) { return ((u << (32-24)) * prime3bytes) >> (32-h) ; }
|
2017-04-21 00:28:31 +00:00
|
|
|
MEM_STATIC size_t ZSTD_hash3Ptr(const void* ptr, U32 h) { return ZSTD_hash3(MEM_readLE32(ptr), h); } /* only in zstd_opt.h */
|
2016-02-19 09:09:35 +00:00
|
|
|
|
2015-10-30 14:49:48 +00:00
|
|
|
static const U32 prime4bytes = 2654435761U;
|
2016-01-28 16:56:33 +00:00
|
|
|
static U32 ZSTD_hash4(U32 u, U32 h) { return (u * prime4bytes) >> (32-h) ; }
|
2015-11-11 12:43:58 +00:00
|
|
|
static size_t ZSTD_hash4Ptr(const void* ptr, U32 h) { return ZSTD_hash4(MEM_read32(ptr), h); }
|
2015-10-29 15:49:43 +00:00
|
|
|
|
2015-10-30 14:49:48 +00:00
|
|
|
static const U64 prime5bytes = 889523592379ULL;
|
2016-01-28 16:56:33 +00:00
|
|
|
static size_t ZSTD_hash5(U64 u, U32 h) { return (size_t)(((u << (64-40)) * prime5bytes) >> (64-h)) ; }
|
2016-02-07 03:00:27 +00:00
|
|
|
static size_t ZSTD_hash5Ptr(const void* p, U32 h) { return ZSTD_hash5(MEM_readLE64(p), h); }
|
2015-10-29 15:49:43 +00:00
|
|
|
|
2015-10-30 14:49:48 +00:00
|
|
|
static const U64 prime6bytes = 227718039650203ULL;
|
2016-01-28 16:56:33 +00:00
|
|
|
static size_t ZSTD_hash6(U64 u, U32 h) { return (size_t)(((u << (64-48)) * prime6bytes) >> (64-h)) ; }
|
2016-02-07 03:00:27 +00:00
|
|
|
static size_t ZSTD_hash6Ptr(const void* p, U32 h) { return ZSTD_hash6(MEM_readLE64(p), h); }
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2015-11-11 20:38:21 +00:00
|
|
|
static const U64 prime7bytes = 58295818150454627ULL;
|
2016-01-28 16:56:33 +00:00
|
|
|
static size_t ZSTD_hash7(U64 u, U32 h) { return (size_t)(((u << (64-56)) * prime7bytes) >> (64-h)) ; }
|
2016-02-07 03:00:27 +00:00
|
|
|
static size_t ZSTD_hash7Ptr(const void* p, U32 h) { return ZSTD_hash7(MEM_readLE64(p), h); }
|
2015-11-05 16:32:18 +00:00
|
|
|
|
2016-07-12 07:47:31 +00:00
|
|
|
static const U64 prime8bytes = 0xCF1BBCDCB7A56463ULL;
|
|
|
|
static size_t ZSTD_hash8(U64 u, U32 h) { return (size_t)(((u) * prime8bytes) >> (64-h)) ; }
|
|
|
|
static size_t ZSTD_hash8Ptr(const void* p, U32 h) { return ZSTD_hash8(MEM_readLE64(p), h); }
|
|
|
|
|
2015-11-11 12:43:58 +00:00
|
|
|
static size_t ZSTD_hashPtr(const void* p, U32 hBits, U32 mls)
|
2015-10-30 14:49:48 +00:00
|
|
|
{
|
|
|
|
switch(mls)
|
|
|
|
{
|
|
|
|
default:
|
2015-11-11 12:43:58 +00:00
|
|
|
case 4: return ZSTD_hash4Ptr(p, hBits);
|
|
|
|
case 5: return ZSTD_hash5Ptr(p, hBits);
|
|
|
|
case 6: return ZSTD_hash6Ptr(p, hBits);
|
|
|
|
case 7: return ZSTD_hash7Ptr(p, hBits);
|
2016-07-12 07:47:31 +00:00
|
|
|
case 8: return ZSTD_hash8Ptr(p, hBits);
|
2015-10-30 14:49:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-28 16:56:33 +00:00
|
|
|
|
2016-02-02 13:36:49 +00:00
|
|
|
/*-*************************************
|
2015-11-05 16:32:18 +00:00
|
|
|
* Fast Scan
|
|
|
|
***************************************/
|
2015-12-04 16:16:37 +00:00
|
|
|
static void ZSTD_fillHashTable (ZSTD_CCtx* zc, const void* end, const U32 mls)
|
|
|
|
{
|
|
|
|
U32* const hashTable = zc->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hBits = zc->appliedParams.cParams.hashLog;
|
2015-12-04 16:16:37 +00:00
|
|
|
const BYTE* const base = zc->base;
|
|
|
|
const BYTE* ip = base + zc->nextToUpdate;
|
2016-07-27 19:05:12 +00:00
|
|
|
const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
|
2016-03-19 14:11:42 +00:00
|
|
|
const size_t fastHashFillStep = 3;
|
2015-12-04 16:16:37 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
while(ip <= iend) {
|
2015-12-04 16:16:37 +00:00
|
|
|
hashTable[ZSTD_hashPtr(ip, hBits, mls)] = (U32)(ip - base);
|
2016-03-19 14:11:42 +00:00
|
|
|
ip += fastHashFillStep;
|
2015-12-04 16:16:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-11-05 16:32:18 +00:00
|
|
|
FORCE_INLINE
|
2016-06-13 23:49:25 +00:00
|
|
|
void ZSTD_compressBlock_fast_generic(ZSTD_CCtx* cctx,
|
2016-08-07 22:44:00 +00:00
|
|
|
const void* src, size_t srcSize,
|
|
|
|
const U32 mls)
|
2015-11-05 16:32:18 +00:00
|
|
|
{
|
2016-06-13 23:49:25 +00:00
|
|
|
U32* const hashTable = cctx->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hBits = cctx->appliedParams.cParams.hashLog;
|
2016-06-13 23:49:25 +00:00
|
|
|
seqStore_t* seqStorePtr = &(cctx->seqStore);
|
|
|
|
const BYTE* const base = cctx->base;
|
2015-11-05 16:32:18 +00:00
|
|
|
const BYTE* const istart = (const BYTE*)src;
|
2015-11-06 09:52:17 +00:00
|
|
|
const BYTE* ip = istart;
|
2015-11-05 16:32:18 +00:00
|
|
|
const BYTE* anchor = istart;
|
2016-07-27 19:05:12 +00:00
|
|
|
const U32 lowestIndex = cctx->dictLimit;
|
2016-06-13 23:49:25 +00:00
|
|
|
const BYTE* const lowest = base + lowestIndex;
|
2015-11-05 16:32:18 +00:00
|
|
|
const BYTE* const iend = istart + srcSize;
|
2016-07-27 19:05:12 +00:00
|
|
|
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
2016-07-02 23:10:53 +00:00
|
|
|
U32 offset_1=cctx->rep[0], offset_2=cctx->rep[1];
|
|
|
|
U32 offsetSaved = 0;
|
2015-11-05 16:32:18 +00:00
|
|
|
|
|
|
|
/* init */
|
2016-06-13 23:49:25 +00:00
|
|
|
ip += (ip==lowest);
|
|
|
|
{ U32 const maxRep = (U32)(ip-lowest);
|
2016-07-02 23:10:53 +00:00
|
|
|
if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
|
|
|
|
if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
|
2016-06-13 23:49:25 +00:00
|
|
|
}
|
2015-11-05 16:32:18 +00:00
|
|
|
|
|
|
|
/* Main Search Loop */
|
2016-06-13 23:49:25 +00:00
|
|
|
while (ip < ilimit) { /* < instead of <=, because repcode check at (ip+1) */
|
2016-06-20 21:34:04 +00:00
|
|
|
size_t mLength;
|
2016-06-13 19:43:06 +00:00
|
|
|
size_t const h = ZSTD_hashPtr(ip, hBits, mls);
|
|
|
|
U32 const current = (U32)(ip-base);
|
|
|
|
U32 const matchIndex = hashTable[h];
|
2015-12-29 13:29:08 +00:00
|
|
|
const BYTE* match = base + matchIndex;
|
2016-01-02 00:16:28 +00:00
|
|
|
hashTable[h] = current; /* update hash table */
|
2015-11-05 16:32:18 +00:00
|
|
|
|
2016-08-07 22:44:00 +00:00
|
|
|
if ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1))) {
|
2016-07-12 07:47:31 +00:00
|
|
|
mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
|
2015-11-20 11:46:08 +00:00
|
|
|
ip++;
|
2016-06-20 21:34:04 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, 0, mLength-MINMATCH);
|
|
|
|
} else {
|
2016-07-02 23:10:53 +00:00
|
|
|
U32 offset;
|
2016-06-20 21:34:04 +00:00
|
|
|
if ( (matchIndex <= lowestIndex) || (MEM_read32(match) != MEM_read32(ip)) ) {
|
2015-11-20 11:46:08 +00:00
|
|
|
ip += ((ip-anchor) >> g_searchStrength) + 1;
|
|
|
|
continue;
|
|
|
|
}
|
2016-07-12 07:47:31 +00:00
|
|
|
mLength = ZSTD_count(ip+4, match+4, iend) + 4;
|
2016-07-02 23:10:53 +00:00
|
|
|
offset = (U32)(ip-match);
|
2016-06-20 21:34:04 +00:00
|
|
|
while (((ip>anchor) & (match>lowest)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
|
2015-11-20 11:46:08 +00:00
|
|
|
offset_2 = offset_1;
|
|
|
|
offset_1 = offset;
|
2016-03-16 14:35:14 +00:00
|
|
|
|
2016-06-20 21:34:04 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
|
2015-11-20 11:46:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* match found */
|
2016-06-20 21:34:04 +00:00
|
|
|
ip += mLength;
|
2015-11-20 11:46:08 +00:00
|
|
|
anchor = ip;
|
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
if (ip <= ilimit) {
|
2015-11-20 11:46:08 +00:00
|
|
|
/* Fill Table */
|
2016-01-07 14:35:18 +00:00
|
|
|
hashTable[ZSTD_hashPtr(base+current+2, hBits, mls)] = current+2; /* here because current+2 could be > iend-8 */
|
2015-11-20 11:46:08 +00:00
|
|
|
hashTable[ZSTD_hashPtr(ip-2, hBits, mls)] = (U32)(ip-2-base);
|
|
|
|
/* check immediate repcode */
|
|
|
|
while ( (ip <= ilimit)
|
2016-06-13 23:49:25 +00:00
|
|
|
&& ( (offset_2>0)
|
2016-06-13 19:43:06 +00:00
|
|
|
& (MEM_read32(ip) == MEM_read32(ip - offset_2)) )) {
|
2015-11-20 11:46:08 +00:00
|
|
|
/* store sequence */
|
2016-07-12 07:47:31 +00:00
|
|
|
size_t const rLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
|
2016-07-02 23:10:53 +00:00
|
|
|
{ U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff; } /* swap offset_2 <=> offset_1 */
|
2015-11-20 11:46:08 +00:00
|
|
|
hashTable[ZSTD_hashPtr(ip, hBits, mls)] = (U32)(ip-base);
|
2016-06-20 21:34:04 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, rLength-MINMATCH);
|
|
|
|
ip += rLength;
|
2015-11-20 11:46:08 +00:00
|
|
|
anchor = ip;
|
|
|
|
continue; /* faster when present ... (?) */
|
2016-01-27 23:18:06 +00:00
|
|
|
} } }
|
2015-11-05 16:32:18 +00:00
|
|
|
|
2016-06-13 23:49:25 +00:00
|
|
|
/* save reps for next block */
|
2017-01-20 01:33:37 +00:00
|
|
|
cctx->repToConfirm[0] = offset_1 ? offset_1 : offsetSaved;
|
|
|
|
cctx->repToConfirm[1] = offset_2 ? offset_2 : offsetSaved;
|
2016-06-13 23:49:25 +00:00
|
|
|
|
2016-03-19 17:08:32 +00:00
|
|
|
/* Last Literals */
|
|
|
|
{ size_t const lastLLSize = iend - anchor;
|
2015-11-05 16:32:18 +00:00
|
|
|
memcpy(seqStorePtr->lit, anchor, lastLLSize);
|
|
|
|
seqStorePtr->lit += lastLLSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-11 06:14:25 +00:00
|
|
|
static void ZSTD_compressBlock_fast(ZSTD_CCtx* ctx,
|
2016-01-23 18:28:41 +00:00
|
|
|
const void* src, size_t srcSize)
|
2015-11-05 16:32:18 +00:00
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 mls = ctx->appliedParams.cParams.searchLength;
|
2015-11-05 16:32:18 +00:00
|
|
|
switch(mls)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default: /* includes case 3 */
|
2015-11-05 16:32:18 +00:00
|
|
|
case 4 :
|
2016-01-23 18:28:41 +00:00
|
|
|
ZSTD_compressBlock_fast_generic(ctx, src, srcSize, 4); return;
|
2015-11-05 16:32:18 +00:00
|
|
|
case 5 :
|
2016-01-23 18:28:41 +00:00
|
|
|
ZSTD_compressBlock_fast_generic(ctx, src, srcSize, 5); return;
|
2015-11-05 16:32:18 +00:00
|
|
|
case 6 :
|
2016-01-23 18:28:41 +00:00
|
|
|
ZSTD_compressBlock_fast_generic(ctx, src, srcSize, 6); return;
|
2015-11-05 16:32:18 +00:00
|
|
|
case 7 :
|
2016-01-23 18:28:41 +00:00
|
|
|
ZSTD_compressBlock_fast_generic(ctx, src, srcSize, 7); return;
|
2015-11-05 16:32:18 +00:00
|
|
|
}
|
|
|
|
}
|
2015-10-22 14:31:46 +00:00
|
|
|
|
|
|
|
|
2016-02-11 06:14:25 +00:00
|
|
|
static void ZSTD_compressBlock_fast_extDict_generic(ZSTD_CCtx* ctx,
|
2016-01-23 18:28:41 +00:00
|
|
|
const void* src, size_t srcSize,
|
|
|
|
const U32 mls)
|
2015-11-13 10:27:46 +00:00
|
|
|
{
|
|
|
|
U32* hashTable = ctx->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 hBits = ctx->appliedParams.cParams.hashLog;
|
2015-11-13 10:27:46 +00:00
|
|
|
seqStore_t* seqStorePtr = &(ctx->seqStore);
|
|
|
|
const BYTE* const base = ctx->base;
|
|
|
|
const BYTE* const dictBase = ctx->dictBase;
|
|
|
|
const BYTE* const istart = (const BYTE*)src;
|
|
|
|
const BYTE* ip = istart;
|
|
|
|
const BYTE* anchor = istart;
|
2016-06-13 19:43:06 +00:00
|
|
|
const U32 lowestIndex = ctx->lowLimit;
|
|
|
|
const BYTE* const dictStart = dictBase + lowestIndex;
|
2015-11-13 10:27:46 +00:00
|
|
|
const U32 dictLimit = ctx->dictLimit;
|
2015-11-20 11:03:53 +00:00
|
|
|
const BYTE* const lowPrefixPtr = base + dictLimit;
|
|
|
|
const BYTE* const dictEnd = dictBase + dictLimit;
|
2015-11-13 10:27:46 +00:00
|
|
|
const BYTE* const iend = istart + srcSize;
|
|
|
|
const BYTE* const ilimit = iend - 8;
|
2016-06-13 23:49:25 +00:00
|
|
|
U32 offset_1=ctx->rep[0], offset_2=ctx->rep[1];
|
2015-11-13 10:27:46 +00:00
|
|
|
|
2016-06-20 21:34:04 +00:00
|
|
|
/* Search Loop */
|
2016-01-27 23:18:06 +00:00
|
|
|
while (ip < ilimit) { /* < instead of <=, because (ip+1) */
|
2015-11-13 10:27:46 +00:00
|
|
|
const size_t h = ZSTD_hashPtr(ip, hBits, mls);
|
2015-11-20 11:03:53 +00:00
|
|
|
const U32 matchIndex = hashTable[h];
|
2015-11-13 10:27:46 +00:00
|
|
|
const BYTE* matchBase = matchIndex < dictLimit ? dictBase : base;
|
2015-11-26 10:43:00 +00:00
|
|
|
const BYTE* match = matchBase + matchIndex;
|
2015-11-13 10:27:46 +00:00
|
|
|
const U32 current = (U32)(ip-base);
|
2016-06-20 21:34:04 +00:00
|
|
|
const U32 repIndex = current + 1 - offset_1; /* offset_1 expected <= current +1 */
|
2015-11-20 11:46:08 +00:00
|
|
|
const BYTE* repBase = repIndex < dictLimit ? dictBase : base;
|
2015-11-13 10:27:46 +00:00
|
|
|
const BYTE* repMatch = repBase + repIndex;
|
2016-06-20 21:34:04 +00:00
|
|
|
size_t mLength;
|
2015-11-13 10:27:46 +00:00
|
|
|
hashTable[h] = current; /* update hash table */
|
|
|
|
|
2016-06-20 21:34:04 +00:00
|
|
|
if ( (((U32)((dictLimit-1) - repIndex) >= 3) /* intentional underflow */ & (repIndex > lowestIndex))
|
2016-06-13 23:49:25 +00:00
|
|
|
&& (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
|
2015-11-20 11:46:08 +00:00
|
|
|
const BYTE* repMatchEnd = repIndex < dictLimit ? dictEnd : iend;
|
2017-04-21 00:28:31 +00:00
|
|
|
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, lowPrefixPtr) + 4;
|
2015-11-20 11:03:53 +00:00
|
|
|
ip++;
|
2016-06-20 21:34:04 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, 0, mLength-MINMATCH);
|
2016-01-27 23:18:06 +00:00
|
|
|
} else {
|
2016-06-13 19:43:06 +00:00
|
|
|
if ( (matchIndex < lowestIndex) ||
|
2016-03-20 15:00:00 +00:00
|
|
|
(MEM_read32(match) != MEM_read32(ip)) ) {
|
|
|
|
ip += ((ip-anchor) >> g_searchStrength) + 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
{ const BYTE* matchEnd = matchIndex < dictLimit ? dictEnd : iend;
|
2015-11-23 12:34:21 +00:00
|
|
|
const BYTE* lowMatchPtr = matchIndex < dictLimit ? dictStart : lowPrefixPtr;
|
2016-06-20 21:34:04 +00:00
|
|
|
U32 offset;
|
2017-04-21 00:28:31 +00:00
|
|
|
mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, lowPrefixPtr) + 4;
|
2016-06-20 21:34:04 +00:00
|
|
|
while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
|
2015-11-20 11:46:08 +00:00
|
|
|
offset = current - matchIndex;
|
|
|
|
offset_2 = offset_1;
|
|
|
|
offset_1 = offset;
|
2016-06-20 21:34:04 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-20 11:46:08 +00:00
|
|
|
|
2015-11-23 12:34:21 +00:00
|
|
|
/* found a match : store it */
|
2016-06-20 21:34:04 +00:00
|
|
|
ip += mLength;
|
2015-11-20 11:46:08 +00:00
|
|
|
anchor = ip;
|
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
if (ip <= ilimit) {
|
2015-11-26 10:43:00 +00:00
|
|
|
/* Fill Table */
|
2016-09-06 13:36:19 +00:00
|
|
|
hashTable[ZSTD_hashPtr(base+current+2, hBits, mls)] = current+2;
|
2015-11-20 11:46:08 +00:00
|
|
|
hashTable[ZSTD_hashPtr(ip-2, hBits, mls)] = (U32)(ip-2-base);
|
|
|
|
/* check immediate repcode */
|
2016-01-27 23:18:06 +00:00
|
|
|
while (ip <= ilimit) {
|
2016-04-01 13:48:48 +00:00
|
|
|
U32 const current2 = (U32)(ip-base);
|
|
|
|
U32 const repIndex2 = current2 - offset_2;
|
2015-11-20 11:46:08 +00:00
|
|
|
const BYTE* repMatch2 = repIndex2 < dictLimit ? dictBase + repIndex2 : base + repIndex2;
|
2016-06-13 23:49:25 +00:00
|
|
|
if ( (((U32)((dictLimit-1) - repIndex2) >= 3) & (repIndex2 > lowestIndex)) /* intentional overflow */
|
|
|
|
&& (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
|
2015-11-23 12:34:21 +00:00
|
|
|
const BYTE* const repEnd2 = repIndex2 < dictLimit ? dictEnd : iend;
|
2017-04-21 00:28:31 +00:00
|
|
|
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, lowPrefixPtr) + 4;
|
2015-11-23 12:34:21 +00:00
|
|
|
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
2016-04-06 07:46:01 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, repLength2-MINMATCH);
|
2015-11-23 12:34:21 +00:00
|
|
|
hashTable[ZSTD_hashPtr(ip, hBits, mls)] = current2;
|
2016-04-06 07:46:01 +00:00
|
|
|
ip += repLength2;
|
2015-11-20 11:46:08 +00:00
|
|
|
anchor = ip;
|
|
|
|
continue;
|
|
|
|
}
|
2015-11-20 11:03:53 +00:00
|
|
|
break;
|
2016-01-27 23:18:06 +00:00
|
|
|
} } }
|
2015-11-13 10:27:46 +00:00
|
|
|
|
2016-06-13 23:49:25 +00:00
|
|
|
/* save reps for next block */
|
2017-01-20 01:33:37 +00:00
|
|
|
ctx->repToConfirm[0] = offset_1; ctx->repToConfirm[1] = offset_2;
|
2016-06-13 23:49:25 +00:00
|
|
|
|
2015-11-13 10:27:46 +00:00
|
|
|
/* Last Literals */
|
2016-03-19 17:08:32 +00:00
|
|
|
{ size_t const lastLLSize = iend - anchor;
|
2015-11-13 10:27:46 +00:00
|
|
|
memcpy(seqStorePtr->lit, anchor, lastLLSize);
|
|
|
|
seqStorePtr->lit += lastLLSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-11 06:14:25 +00:00
|
|
|
static void ZSTD_compressBlock_fast_extDict(ZSTD_CCtx* ctx,
|
2015-11-13 10:27:46 +00:00
|
|
|
const void* src, size_t srcSize)
|
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const mls = ctx->appliedParams.cParams.searchLength;
|
2015-11-13 10:27:46 +00:00
|
|
|
switch(mls)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default: /* includes case 3 */
|
2015-11-13 10:27:46 +00:00
|
|
|
case 4 :
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_fast_extDict_generic(ctx, src, srcSize, 4); return;
|
2015-11-13 10:27:46 +00:00
|
|
|
case 5 :
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_fast_extDict_generic(ctx, src, srcSize, 5); return;
|
2015-11-13 10:27:46 +00:00
|
|
|
case 6 :
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_fast_extDict_generic(ctx, src, srcSize, 6); return;
|
2015-11-13 10:27:46 +00:00
|
|
|
case 7 :
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_fast_extDict_generic(ctx, src, srcSize, 7); return;
|
2015-11-13 10:27:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-12 07:47:31 +00:00
|
|
|
/*-*************************************
|
|
|
|
* Double Fast
|
|
|
|
***************************************/
|
|
|
|
static void ZSTD_fillDoubleHashTable (ZSTD_CCtx* cctx, const void* end, const U32 mls)
|
|
|
|
{
|
|
|
|
U32* const hashLarge = cctx->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hBitsL = cctx->appliedParams.cParams.hashLog;
|
2016-07-12 07:47:31 +00:00
|
|
|
U32* const hashSmall = cctx->chainTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hBitsS = cctx->appliedParams.cParams.chainLog;
|
2016-07-12 07:47:31 +00:00
|
|
|
const BYTE* const base = cctx->base;
|
|
|
|
const BYTE* ip = base + cctx->nextToUpdate;
|
2016-07-27 19:05:12 +00:00
|
|
|
const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
|
2016-07-12 07:47:31 +00:00
|
|
|
const size_t fastHashFillStep = 3;
|
|
|
|
|
|
|
|
while(ip <= iend) {
|
|
|
|
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip - base);
|
|
|
|
hashLarge[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip - base);
|
|
|
|
ip += fastHashFillStep;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FORCE_INLINE
|
|
|
|
void ZSTD_compressBlock_doubleFast_generic(ZSTD_CCtx* cctx,
|
|
|
|
const void* src, size_t srcSize,
|
|
|
|
const U32 mls)
|
|
|
|
{
|
|
|
|
U32* const hashLong = cctx->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 hBitsL = cctx->appliedParams.cParams.hashLog;
|
2016-07-12 07:47:31 +00:00
|
|
|
U32* const hashSmall = cctx->chainTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 hBitsS = cctx->appliedParams.cParams.chainLog;
|
2016-07-12 07:47:31 +00:00
|
|
|
seqStore_t* seqStorePtr = &(cctx->seqStore);
|
|
|
|
const BYTE* const base = cctx->base;
|
|
|
|
const BYTE* const istart = (const BYTE*)src;
|
|
|
|
const BYTE* ip = istart;
|
|
|
|
const BYTE* anchor = istart;
|
|
|
|
const U32 lowestIndex = cctx->dictLimit;
|
|
|
|
const BYTE* const lowest = base + lowestIndex;
|
|
|
|
const BYTE* const iend = istart + srcSize;
|
2016-07-27 19:05:12 +00:00
|
|
|
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
2016-07-12 07:47:31 +00:00
|
|
|
U32 offset_1=cctx->rep[0], offset_2=cctx->rep[1];
|
|
|
|
U32 offsetSaved = 0;
|
|
|
|
|
|
|
|
/* init */
|
|
|
|
ip += (ip==lowest);
|
|
|
|
{ U32 const maxRep = (U32)(ip-lowest);
|
|
|
|
if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
|
|
|
|
if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Main Search Loop */
|
|
|
|
while (ip < ilimit) { /* < instead of <=, because repcode check at (ip+1) */
|
|
|
|
size_t mLength;
|
|
|
|
size_t const h2 = ZSTD_hashPtr(ip, hBitsL, 8);
|
|
|
|
size_t const h = ZSTD_hashPtr(ip, hBitsS, mls);
|
|
|
|
U32 const current = (U32)(ip-base);
|
|
|
|
U32 const matchIndexL = hashLong[h2];
|
|
|
|
U32 const matchIndexS = hashSmall[h];
|
|
|
|
const BYTE* matchLong = base + matchIndexL;
|
|
|
|
const BYTE* match = base + matchIndexS;
|
|
|
|
hashLong[h2] = hashSmall[h] = current; /* update hash tables */
|
|
|
|
|
2017-04-20 19:50:02 +00:00
|
|
|
assert(offset_1 <= current); /* supposed guaranteed by construction */
|
|
|
|
if ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1))) {
|
2017-04-21 00:28:31 +00:00
|
|
|
/* favor repcode */
|
2016-07-12 07:47:31 +00:00
|
|
|
mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
|
|
|
|
ip++;
|
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, 0, mLength-MINMATCH);
|
|
|
|
} else {
|
2016-07-12 13:11:40 +00:00
|
|
|
U32 offset;
|
2016-07-12 07:47:31 +00:00
|
|
|
if ( (matchIndexL > lowestIndex) && (MEM_read64(matchLong) == MEM_read64(ip)) ) {
|
|
|
|
mLength = ZSTD_count(ip+8, matchLong+8, iend) + 8;
|
2016-07-12 13:11:40 +00:00
|
|
|
offset = (U32)(ip-matchLong);
|
2016-07-12 07:47:31 +00:00
|
|
|
while (((ip>anchor) & (matchLong>lowest)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
|
|
|
|
} else if ( (matchIndexS > lowestIndex) && (MEM_read32(match) == MEM_read32(ip)) ) {
|
2017-04-21 00:28:31 +00:00
|
|
|
size_t const hl3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
|
|
|
|
U32 const matchIndexL3 = hashLong[hl3];
|
|
|
|
const BYTE* matchL3 = base + matchIndexL3;
|
|
|
|
hashLong[hl3] = current + 1;
|
|
|
|
if ( (matchIndexL3 > lowestIndex) && (MEM_read64(matchL3) == MEM_read64(ip+1)) ) {
|
|
|
|
mLength = ZSTD_count(ip+9, matchL3+8, iend) + 8;
|
2016-08-23 23:10:42 +00:00
|
|
|
ip++;
|
2017-04-21 00:28:31 +00:00
|
|
|
offset = (U32)(ip-matchL3);
|
|
|
|
while (((ip>anchor) & (matchL3>lowest)) && (ip[-1] == matchL3[-1])) { ip--; matchL3--; mLength++; } /* catch up */
|
2016-08-23 23:10:42 +00:00
|
|
|
} else {
|
|
|
|
mLength = ZSTD_count(ip+4, match+4, iend) + 4;
|
|
|
|
offset = (U32)(ip-match);
|
|
|
|
while (((ip>anchor) & (match>lowest)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
|
|
|
|
}
|
2016-07-12 07:47:31 +00:00
|
|
|
} else {
|
|
|
|
ip += ((ip-anchor) >> g_searchStrength) + 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
offset_2 = offset_1;
|
|
|
|
offset_1 = offset;
|
|
|
|
|
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* match found */
|
|
|
|
ip += mLength;
|
|
|
|
anchor = ip;
|
|
|
|
|
|
|
|
if (ip <= ilimit) {
|
|
|
|
/* Fill Table */
|
|
|
|
hashLong[ZSTD_hashPtr(base+current+2, hBitsL, 8)] =
|
|
|
|
hashSmall[ZSTD_hashPtr(base+current+2, hBitsS, mls)] = current+2; /* here because current+2 could be > iend-8 */
|
|
|
|
hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] =
|
|
|
|
hashSmall[ZSTD_hashPtr(ip-2, hBitsS, mls)] = (U32)(ip-2-base);
|
|
|
|
|
|
|
|
/* check immediate repcode */
|
|
|
|
while ( (ip <= ilimit)
|
|
|
|
&& ( (offset_2>0)
|
|
|
|
& (MEM_read32(ip) == MEM_read32(ip - offset_2)) )) {
|
|
|
|
/* store sequence */
|
|
|
|
size_t const rLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
|
2016-07-12 13:11:40 +00:00
|
|
|
{ U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff; } /* swap offset_2 <=> offset_1 */
|
2016-07-12 07:47:31 +00:00
|
|
|
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip-base);
|
|
|
|
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip-base);
|
|
|
|
ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, rLength-MINMATCH);
|
|
|
|
ip += rLength;
|
|
|
|
anchor = ip;
|
|
|
|
continue; /* faster when present ... (?) */
|
|
|
|
} } }
|
|
|
|
|
|
|
|
/* save reps for next block */
|
2017-01-20 01:33:37 +00:00
|
|
|
cctx->repToConfirm[0] = offset_1 ? offset_1 : offsetSaved;
|
|
|
|
cctx->repToConfirm[1] = offset_2 ? offset_2 : offsetSaved;
|
2016-07-12 07:47:31 +00:00
|
|
|
|
|
|
|
/* Last Literals */
|
|
|
|
{ size_t const lastLLSize = iend - anchor;
|
|
|
|
memcpy(seqStorePtr->lit, anchor, lastLLSize);
|
|
|
|
seqStorePtr->lit += lastLLSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void ZSTD_compressBlock_doubleFast(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 mls = ctx->appliedParams.cParams.searchLength;
|
2016-07-12 07:47:31 +00:00
|
|
|
switch(mls)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default: /* includes case 3 */
|
2016-07-12 07:47:31 +00:00
|
|
|
case 4 :
|
|
|
|
ZSTD_compressBlock_doubleFast_generic(ctx, src, srcSize, 4); return;
|
|
|
|
case 5 :
|
|
|
|
ZSTD_compressBlock_doubleFast_generic(ctx, src, srcSize, 5); return;
|
|
|
|
case 6 :
|
|
|
|
ZSTD_compressBlock_doubleFast_generic(ctx, src, srcSize, 6); return;
|
|
|
|
case 7 :
|
|
|
|
ZSTD_compressBlock_doubleFast_generic(ctx, src, srcSize, 7); return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void ZSTD_compressBlock_doubleFast_extDict_generic(ZSTD_CCtx* ctx,
|
|
|
|
const void* src, size_t srcSize,
|
|
|
|
const U32 mls)
|
|
|
|
{
|
|
|
|
U32* const hashLong = ctx->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hBitsL = ctx->appliedParams.cParams.hashLog;
|
2016-07-12 07:47:31 +00:00
|
|
|
U32* const hashSmall = ctx->chainTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hBitsS = ctx->appliedParams.cParams.chainLog;
|
2016-07-12 07:47:31 +00:00
|
|
|
seqStore_t* seqStorePtr = &(ctx->seqStore);
|
|
|
|
const BYTE* const base = ctx->base;
|
|
|
|
const BYTE* const dictBase = ctx->dictBase;
|
|
|
|
const BYTE* const istart = (const BYTE*)src;
|
|
|
|
const BYTE* ip = istart;
|
|
|
|
const BYTE* anchor = istart;
|
|
|
|
const U32 lowestIndex = ctx->lowLimit;
|
|
|
|
const BYTE* const dictStart = dictBase + lowestIndex;
|
|
|
|
const U32 dictLimit = ctx->dictLimit;
|
|
|
|
const BYTE* const lowPrefixPtr = base + dictLimit;
|
|
|
|
const BYTE* const dictEnd = dictBase + dictLimit;
|
|
|
|
const BYTE* const iend = istart + srcSize;
|
|
|
|
const BYTE* const ilimit = iend - 8;
|
|
|
|
U32 offset_1=ctx->rep[0], offset_2=ctx->rep[1];
|
|
|
|
|
|
|
|
/* Search Loop */
|
|
|
|
while (ip < ilimit) { /* < instead of <=, because (ip+1) */
|
|
|
|
const size_t hSmall = ZSTD_hashPtr(ip, hBitsS, mls);
|
|
|
|
const U32 matchIndex = hashSmall[hSmall];
|
|
|
|
const BYTE* matchBase = matchIndex < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* match = matchBase + matchIndex;
|
|
|
|
|
|
|
|
const size_t hLong = ZSTD_hashPtr(ip, hBitsL, 8);
|
|
|
|
const U32 matchLongIndex = hashLong[hLong];
|
|
|
|
const BYTE* matchLongBase = matchLongIndex < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* matchLong = matchLongBase + matchLongIndex;
|
|
|
|
|
|
|
|
const U32 current = (U32)(ip-base);
|
|
|
|
const U32 repIndex = current + 1 - offset_1; /* offset_1 expected <= current +1 */
|
|
|
|
const BYTE* repBase = repIndex < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* repMatch = repBase + repIndex;
|
|
|
|
size_t mLength;
|
|
|
|
hashSmall[hSmall] = hashLong[hLong] = current; /* update hash table */
|
|
|
|
|
|
|
|
if ( (((U32)((dictLimit-1) - repIndex) >= 3) /* intentional underflow */ & (repIndex > lowestIndex))
|
|
|
|
&& (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
|
|
|
|
const BYTE* repMatchEnd = repIndex < dictLimit ? dictEnd : iend;
|
|
|
|
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, lowPrefixPtr) + 4;
|
|
|
|
ip++;
|
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, 0, mLength-MINMATCH);
|
|
|
|
} else {
|
|
|
|
if ((matchLongIndex > lowestIndex) && (MEM_read64(matchLong) == MEM_read64(ip))) {
|
|
|
|
const BYTE* matchEnd = matchLongIndex < dictLimit ? dictEnd : iend;
|
|
|
|
const BYTE* lowMatchPtr = matchLongIndex < dictLimit ? dictStart : lowPrefixPtr;
|
|
|
|
U32 offset;
|
|
|
|
mLength = ZSTD_count_2segments(ip+8, matchLong+8, iend, matchEnd, lowPrefixPtr) + 8;
|
|
|
|
offset = current - matchLongIndex;
|
|
|
|
while (((ip>anchor) & (matchLong>lowMatchPtr)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
|
|
|
|
offset_2 = offset_1;
|
|
|
|
offset_1 = offset;
|
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
|
2016-08-23 23:10:42 +00:00
|
|
|
|
2016-07-12 11:03:48 +00:00
|
|
|
} else if ((matchIndex > lowestIndex) && (MEM_read32(match) == MEM_read32(ip))) {
|
2016-08-23 23:10:42 +00:00
|
|
|
size_t const h3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
|
|
|
|
U32 const matchIndex3 = hashLong[h3];
|
|
|
|
const BYTE* const match3Base = matchIndex3 < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* match3 = match3Base + matchIndex3;
|
2016-07-12 07:47:31 +00:00
|
|
|
U32 offset;
|
2016-08-23 23:10:42 +00:00
|
|
|
hashLong[h3] = current + 1;
|
|
|
|
if ( (matchIndex3 > lowestIndex) && (MEM_read64(match3) == MEM_read64(ip+1)) ) {
|
|
|
|
const BYTE* matchEnd = matchIndex3 < dictLimit ? dictEnd : iend;
|
|
|
|
const BYTE* lowMatchPtr = matchIndex3 < dictLimit ? dictStart : lowPrefixPtr;
|
|
|
|
mLength = ZSTD_count_2segments(ip+9, match3+8, iend, matchEnd, lowPrefixPtr) + 8;
|
|
|
|
ip++;
|
|
|
|
offset = current+1 - matchIndex3;
|
|
|
|
while (((ip>anchor) & (match3>lowMatchPtr)) && (ip[-1] == match3[-1])) { ip--; match3--; mLength++; } /* catch up */
|
|
|
|
} else {
|
|
|
|
const BYTE* matchEnd = matchIndex < dictLimit ? dictEnd : iend;
|
|
|
|
const BYTE* lowMatchPtr = matchIndex < dictLimit ? dictStart : lowPrefixPtr;
|
|
|
|
mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, lowPrefixPtr) + 4;
|
|
|
|
offset = current - matchIndex;
|
|
|
|
while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
|
|
|
|
}
|
2016-07-12 07:47:31 +00:00
|
|
|
offset_2 = offset_1;
|
|
|
|
offset_1 = offset;
|
|
|
|
ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
|
2016-08-23 23:10:42 +00:00
|
|
|
|
2016-07-12 07:47:31 +00:00
|
|
|
} else {
|
|
|
|
ip += ((ip-anchor) >> g_searchStrength) + 1;
|
|
|
|
continue;
|
|
|
|
} }
|
|
|
|
|
|
|
|
/* found a match : store it */
|
|
|
|
ip += mLength;
|
|
|
|
anchor = ip;
|
|
|
|
|
|
|
|
if (ip <= ilimit) {
|
|
|
|
/* Fill Table */
|
2017-03-09 20:51:33 +00:00
|
|
|
hashSmall[ZSTD_hashPtr(base+current+2, hBitsS, mls)] = current+2;
|
|
|
|
hashLong[ZSTD_hashPtr(base+current+2, hBitsL, 8)] = current+2;
|
2016-07-12 07:47:31 +00:00
|
|
|
hashSmall[ZSTD_hashPtr(ip-2, hBitsS, mls)] = (U32)(ip-2-base);
|
|
|
|
hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base);
|
|
|
|
/* check immediate repcode */
|
|
|
|
while (ip <= ilimit) {
|
|
|
|
U32 const current2 = (U32)(ip-base);
|
|
|
|
U32 const repIndex2 = current2 - offset_2;
|
|
|
|
const BYTE* repMatch2 = repIndex2 < dictLimit ? dictBase + repIndex2 : base + repIndex2;
|
|
|
|
if ( (((U32)((dictLimit-1) - repIndex2) >= 3) & (repIndex2 > lowestIndex)) /* intentional overflow */
|
|
|
|
&& (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
|
|
|
|
const BYTE* const repEnd2 = repIndex2 < dictLimit ? dictEnd : iend;
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, lowPrefixPtr) + 4;
|
2016-07-12 07:47:31 +00:00
|
|
|
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
|
|
|
ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, repLength2-MINMATCH);
|
|
|
|
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
|
|
|
|
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
|
|
|
|
ip += repLength2;
|
|
|
|
anchor = ip;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
} } }
|
|
|
|
|
|
|
|
/* save reps for next block */
|
2017-01-20 01:33:37 +00:00
|
|
|
ctx->repToConfirm[0] = offset_1; ctx->repToConfirm[1] = offset_2;
|
2016-07-12 07:47:31 +00:00
|
|
|
|
|
|
|
/* Last Literals */
|
|
|
|
{ size_t const lastLLSize = iend - anchor;
|
|
|
|
memcpy(seqStorePtr->lit, anchor, lastLLSize);
|
|
|
|
seqStorePtr->lit += lastLLSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void ZSTD_compressBlock_doubleFast_extDict(ZSTD_CCtx* ctx,
|
|
|
|
const void* src, size_t srcSize)
|
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const mls = ctx->appliedParams.cParams.searchLength;
|
2016-07-12 07:47:31 +00:00
|
|
|
switch(mls)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default: /* includes case 3 */
|
2016-07-12 07:47:31 +00:00
|
|
|
case 4 :
|
|
|
|
ZSTD_compressBlock_doubleFast_extDict_generic(ctx, src, srcSize, 4); return;
|
|
|
|
case 5 :
|
|
|
|
ZSTD_compressBlock_doubleFast_extDict_generic(ctx, src, srcSize, 5); return;
|
|
|
|
case 6 :
|
|
|
|
ZSTD_compressBlock_doubleFast_extDict_generic(ctx, src, srcSize, 6); return;
|
|
|
|
case 7 :
|
|
|
|
ZSTD_compressBlock_doubleFast_extDict_generic(ctx, src, srcSize, 7); return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-11 05:23:24 +00:00
|
|
|
/*-*************************************
|
2015-11-04 02:52:54 +00:00
|
|
|
* Binary Tree search
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2016-02-11 05:23:24 +00:00
|
|
|
/** ZSTD_insertBt1() : add one or multiple positions to tree.
|
|
|
|
* ip : assumed <= iend-8 .
|
2015-11-23 13:23:47 +00:00
|
|
|
* @return : nb of positions added */
|
2016-01-01 06:29:39 +00:00
|
|
|
static U32 ZSTD_insertBt1(ZSTD_CCtx* zc, const BYTE* const ip, const U32 mls, const BYTE* const iend, U32 nbCompares,
|
|
|
|
U32 extDict)
|
2015-11-04 02:52:54 +00:00
|
|
|
{
|
2016-07-27 19:05:12 +00:00
|
|
|
U32* const hashTable = zc->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hashLog = zc->appliedParams.cParams.hashLog;
|
2016-07-27 19:05:12 +00:00
|
|
|
size_t const h = ZSTD_hashPtr(ip, hashLog, mls);
|
|
|
|
U32* const bt = zc->chainTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const btLog = zc->appliedParams.cParams.chainLog - 1;
|
2016-07-27 19:05:12 +00:00
|
|
|
U32 const btMask = (1 << btLog) - 1;
|
|
|
|
U32 matchIndex = hashTable[h];
|
2015-11-04 02:52:54 +00:00
|
|
|
size_t commonLengthSmaller=0, commonLengthLarger=0;
|
|
|
|
const BYTE* const base = zc->base;
|
2016-01-01 06:29:39 +00:00
|
|
|
const BYTE* const dictBase = zc->dictBase;
|
|
|
|
const U32 dictLimit = zc->dictLimit;
|
|
|
|
const BYTE* const dictEnd = dictBase + dictLimit;
|
|
|
|
const BYTE* const prefixStart = base + dictLimit;
|
2016-10-14 23:03:34 +00:00
|
|
|
const BYTE* match;
|
2015-12-11 09:44:07 +00:00
|
|
|
const U32 current = (U32)(ip-base);
|
2015-11-08 14:08:03 +00:00
|
|
|
const U32 btLow = btMask >= current ? 0 : current - btMask;
|
2015-11-04 02:52:54 +00:00
|
|
|
U32* smallerPtr = bt + 2*(current&btMask);
|
2016-01-16 23:12:55 +00:00
|
|
|
U32* largerPtr = smallerPtr + 1;
|
2015-11-04 11:05:27 +00:00
|
|
|
U32 dummy32; /* to be nullified at the end */
|
2016-07-27 19:05:12 +00:00
|
|
|
U32 const windowLow = zc->lowLimit;
|
2015-12-31 18:08:44 +00:00
|
|
|
U32 matchEndIdx = current+8;
|
2016-02-15 16:06:29 +00:00
|
|
|
size_t bestLength = 8;
|
2016-06-30 12:07:30 +00:00
|
|
|
#ifdef ZSTD_C_PREDICT
|
2016-01-21 10:57:45 +00:00
|
|
|
U32 predictedSmall = *(bt + 2*((current-1)&btMask) + 0);
|
|
|
|
U32 predictedLarge = *(bt + 2*((current-1)&btMask) + 1);
|
|
|
|
predictedSmall += (predictedSmall>0);
|
|
|
|
predictedLarge += (predictedLarge>0);
|
2016-06-30 12:07:30 +00:00
|
|
|
#endif /* ZSTD_C_PREDICT */
|
2015-11-07 00:13:31 +00:00
|
|
|
|
2015-12-11 09:44:07 +00:00
|
|
|
hashTable[h] = current; /* Update Hash Table */
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
while (nbCompares-- && (matchIndex > windowLow)) {
|
2016-11-30 00:59:27 +00:00
|
|
|
U32* const nextPtr = bt + 2*(matchIndex & btMask);
|
2015-11-04 02:52:54 +00:00
|
|
|
size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */
|
2016-11-30 00:59:27 +00:00
|
|
|
|
2016-06-30 12:07:30 +00:00
|
|
|
#ifdef ZSTD_C_PREDICT /* note : can create issues when hlog small <= 11 */
|
2016-02-10 12:37:52 +00:00
|
|
|
const U32* predictPtr = bt + 2*((matchIndex-1) & btMask); /* written this way, as bt is a roll buffer */
|
2016-01-27 23:18:06 +00:00
|
|
|
if (matchIndex == predictedSmall) {
|
|
|
|
/* no need to check length, result known */
|
2016-01-16 23:12:55 +00:00
|
|
|
*smallerPtr = matchIndex;
|
|
|
|
if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop the search */
|
|
|
|
smallerPtr = nextPtr+1; /* new "smaller" => larger of match */
|
|
|
|
matchIndex = nextPtr[1]; /* new matchIndex larger than previous (closer to current) */
|
2016-01-21 10:57:45 +00:00
|
|
|
predictedSmall = predictPtr[1] + (predictPtr[1]>0);
|
2016-01-16 23:12:55 +00:00
|
|
|
continue;
|
|
|
|
}
|
2016-01-27 23:18:06 +00:00
|
|
|
if (matchIndex == predictedLarge) {
|
2016-01-16 23:12:55 +00:00
|
|
|
*largerPtr = matchIndex;
|
|
|
|
if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop the search */
|
|
|
|
largerPtr = nextPtr;
|
|
|
|
matchIndex = nextPtr[0];
|
2016-01-21 10:57:45 +00:00
|
|
|
predictedLarge = predictPtr[0] + (predictPtr[0]>0);
|
2016-01-16 23:12:55 +00:00
|
|
|
continue;
|
|
|
|
}
|
2016-02-11 05:23:24 +00:00
|
|
|
#endif
|
2016-01-27 23:18:06 +00:00
|
|
|
if ((!extDict) || (matchIndex+matchLength >= dictLimit)) {
|
2016-01-01 06:29:39 +00:00
|
|
|
match = base + matchIndex;
|
|
|
|
if (match[matchLength] == ip[matchLength])
|
|
|
|
matchLength += ZSTD_count(ip+matchLength+1, match+matchLength+1, iend) +1;
|
2016-01-27 23:18:06 +00:00
|
|
|
} else {
|
2016-01-01 06:29:39 +00:00
|
|
|
match = dictBase + matchIndex;
|
|
|
|
matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
|
|
|
|
if (matchIndex+matchLength >= dictLimit)
|
2017-03-09 20:51:33 +00:00
|
|
|
match = base + matchIndex; /* to prepare for next usage of match[matchLength] */
|
2016-01-01 06:29:39 +00:00
|
|
|
}
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2016-02-15 16:06:29 +00:00
|
|
|
if (matchLength > bestLength) {
|
|
|
|
bestLength = matchLength;
|
|
|
|
if (matchLength > matchEndIdx - matchIndex)
|
|
|
|
matchEndIdx = matchIndex + (U32)matchLength;
|
|
|
|
}
|
2015-12-29 21:26:09 +00:00
|
|
|
|
2015-11-04 11:05:27 +00:00
|
|
|
if (ip+matchLength == iend) /* equal : no way to know if inf or sup */
|
2016-01-01 06:29:39 +00:00
|
|
|
break; /* drop , to guarantee consistency ; miss a bit of compression, but other solutions can corrupt the tree */
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
if (match[matchLength] < ip[matchLength]) { /* necessarily within correct buffer */
|
2015-11-04 02:52:54 +00:00
|
|
|
/* match is smaller than current */
|
|
|
|
*smallerPtr = matchIndex; /* update smaller idx */
|
|
|
|
commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */
|
2015-11-07 00:13:31 +00:00
|
|
|
if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop the search */
|
2015-11-04 02:52:54 +00:00
|
|
|
smallerPtr = nextPtr+1; /* new "smaller" => larger of match */
|
2015-11-07 00:13:31 +00:00
|
|
|
matchIndex = nextPtr[1]; /* new matchIndex larger than previous (closer to current) */
|
2016-01-27 23:18:06 +00:00
|
|
|
} else {
|
2015-11-04 02:52:54 +00:00
|
|
|
/* match is larger than current */
|
|
|
|
*largerPtr = matchIndex;
|
|
|
|
commonLengthLarger = matchLength;
|
2015-11-07 00:13:31 +00:00
|
|
|
if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop the search */
|
2015-11-04 02:52:54 +00:00
|
|
|
largerPtr = nextPtr;
|
2015-11-07 00:13:31 +00:00
|
|
|
matchIndex = nextPtr[0];
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2015-11-04 11:05:27 +00:00
|
|
|
*smallerPtr = *largerPtr = 0;
|
2016-06-20 21:34:04 +00:00
|
|
|
if (bestLength > 384) return MIN(192, (U32)(bestLength - 384)); /* speed optimization */
|
2016-02-15 16:06:29 +00:00
|
|
|
if (matchEndIdx > current + 8) return matchEndIdx - current - 8;
|
|
|
|
return 1;
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-11 06:14:25 +00:00
|
|
|
static size_t ZSTD_insertBtAndFindBestMatch (
|
2015-11-11 12:43:58 +00:00
|
|
|
ZSTD_CCtx* zc,
|
2015-11-04 02:52:54 +00:00
|
|
|
const BYTE* const ip, const BYTE* const iend,
|
|
|
|
size_t* offsetPtr,
|
2016-01-01 06:47:58 +00:00
|
|
|
U32 nbCompares, const U32 mls,
|
|
|
|
U32 extDict)
|
2015-11-04 02:52:54 +00:00
|
|
|
{
|
2016-07-27 19:05:12 +00:00
|
|
|
U32* const hashTable = zc->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const hashLog = zc->appliedParams.cParams.hashLog;
|
2016-07-27 19:05:12 +00:00
|
|
|
size_t const h = ZSTD_hashPtr(ip, hashLog, mls);
|
|
|
|
U32* const bt = zc->chainTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const btLog = zc->appliedParams.cParams.chainLog - 1;
|
2016-07-27 19:05:12 +00:00
|
|
|
U32 const btMask = (1 << btLog) - 1;
|
2015-11-04 02:52:54 +00:00
|
|
|
U32 matchIndex = hashTable[h];
|
|
|
|
size_t commonLengthSmaller=0, commonLengthLarger=0;
|
|
|
|
const BYTE* const base = zc->base;
|
2016-01-01 06:47:58 +00:00
|
|
|
const BYTE* const dictBase = zc->dictBase;
|
|
|
|
const U32 dictLimit = zc->dictLimit;
|
|
|
|
const BYTE* const dictEnd = dictBase + dictLimit;
|
|
|
|
const BYTE* const prefixStart = base + dictLimit;
|
2015-11-04 02:52:54 +00:00
|
|
|
const U32 current = (U32)(ip-base);
|
|
|
|
const U32 btLow = btMask >= current ? 0 : current - btMask;
|
2015-11-23 14:29:15 +00:00
|
|
|
const U32 windowLow = zc->lowLimit;
|
2015-11-04 02:52:54 +00:00
|
|
|
U32* smallerPtr = bt + 2*(current&btMask);
|
|
|
|
U32* largerPtr = bt + 2*(current&btMask) + 1;
|
2015-12-31 18:08:44 +00:00
|
|
|
U32 matchEndIdx = current+8;
|
2015-11-04 11:05:27 +00:00
|
|
|
U32 dummy32; /* to be nullified at the end */
|
2016-04-07 17:14:09 +00:00
|
|
|
size_t bestLength = 0;
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2015-12-11 09:44:07 +00:00
|
|
|
hashTable[h] = current; /* Update Hash Table */
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
while (nbCompares-- && (matchIndex > windowLow)) {
|
2016-11-30 00:59:27 +00:00
|
|
|
U32* const nextPtr = bt + 2*(matchIndex & btMask);
|
2015-11-04 02:52:54 +00:00
|
|
|
size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */
|
2016-01-01 06:47:58 +00:00
|
|
|
const BYTE* match;
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
if ((!extDict) || (matchIndex+matchLength >= dictLimit)) {
|
2016-01-01 06:47:58 +00:00
|
|
|
match = base + matchIndex;
|
|
|
|
if (match[matchLength] == ip[matchLength])
|
|
|
|
matchLength += ZSTD_count(ip+matchLength+1, match+matchLength+1, iend) +1;
|
2016-01-27 23:18:06 +00:00
|
|
|
} else {
|
2016-01-01 06:47:58 +00:00
|
|
|
match = dictBase + matchIndex;
|
|
|
|
matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
|
|
|
|
if (matchIndex+matchLength >= dictLimit)
|
2017-03-09 20:51:33 +00:00
|
|
|
match = base + matchIndex; /* to prepare for next usage of match[matchLength] */
|
2016-01-01 06:47:58 +00:00
|
|
|
}
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
if (matchLength > bestLength) {
|
2015-12-29 21:26:09 +00:00
|
|
|
if (matchLength > matchEndIdx - matchIndex)
|
2015-12-29 22:40:02 +00:00
|
|
|
matchEndIdx = matchIndex + (U32)matchLength;
|
2016-06-04 18:17:38 +00:00
|
|
|
if ( (4*(int)(matchLength-bestLength)) > (int)(ZSTD_highbit32(current-matchIndex+1) - ZSTD_highbit32((U32)offsetPtr[0]+1)) )
|
2016-04-06 10:34:42 +00:00
|
|
|
bestLength = matchLength, *offsetPtr = ZSTD_REP_MOVE + current - matchIndex;
|
2015-11-04 11:05:27 +00:00
|
|
|
if (ip+matchLength == iend) /* equal : no way to know if inf or sup */
|
2015-11-23 12:34:21 +00:00
|
|
|
break; /* drop, to guarantee consistency (miss a little bit of compression) */
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
|
|
|
|
2016-01-27 23:18:06 +00:00
|
|
|
if (match[matchLength] < ip[matchLength]) {
|
2015-11-04 02:52:54 +00:00
|
|
|
/* match is smaller than current */
|
|
|
|
*smallerPtr = matchIndex; /* update smaller idx */
|
|
|
|
commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */
|
2015-11-23 12:34:21 +00:00
|
|
|
if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop the search */
|
2015-11-04 11:05:27 +00:00
|
|
|
smallerPtr = nextPtr+1; /* new "smaller" => larger of match */
|
2015-11-23 12:34:21 +00:00
|
|
|
matchIndex = nextPtr[1]; /* new matchIndex larger than previous (closer to current) */
|
2016-01-27 23:18:06 +00:00
|
|
|
} else {
|
2015-11-04 02:52:54 +00:00
|
|
|
/* match is larger than current */
|
|
|
|
*largerPtr = matchIndex;
|
|
|
|
commonLengthLarger = matchLength;
|
2015-11-23 12:34:21 +00:00
|
|
|
if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop the search */
|
2015-11-04 02:52:54 +00:00
|
|
|
largerPtr = nextPtr;
|
2015-11-23 12:34:21 +00:00
|
|
|
matchIndex = nextPtr[0];
|
2016-02-10 13:01:49 +00:00
|
|
|
} }
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2015-11-04 11:05:27 +00:00
|
|
|
*smallerPtr = *largerPtr = 0;
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2015-12-31 18:08:44 +00:00
|
|
|
zc->nextToUpdate = (matchEndIdx > current + 8) ? matchEndIdx - 8 : current+1;
|
2016-04-07 17:14:09 +00:00
|
|
|
return bestLength;
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-15 16:06:29 +00:00
|
|
|
static void ZSTD_updateTree(ZSTD_CCtx* zc, const BYTE* const ip, const BYTE* const iend, const U32 nbCompares, const U32 mls)
|
2016-02-11 06:14:25 +00:00
|
|
|
{
|
|
|
|
const BYTE* const base = zc->base;
|
|
|
|
const U32 target = (U32)(ip - base);
|
|
|
|
U32 idx = zc->nextToUpdate;
|
2016-02-15 16:06:29 +00:00
|
|
|
|
|
|
|
while(idx < target)
|
|
|
|
idx += ZSTD_insertBt1(zc, base+idx, mls, iend, nbCompares, 0);
|
2016-02-11 06:14:25 +00:00
|
|
|
}
|
|
|
|
|
2016-03-20 15:00:00 +00:00
|
|
|
/** ZSTD_BtFindBestMatch() : Tree updater, providing best match */
|
2016-02-11 06:14:25 +00:00
|
|
|
static size_t ZSTD_BtFindBestMatch (
|
2015-11-11 12:43:58 +00:00
|
|
|
ZSTD_CCtx* zc,
|
2015-11-04 02:52:54 +00:00
|
|
|
const BYTE* const ip, const BYTE* const iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
const U32 maxNbAttempts, const U32 mls)
|
|
|
|
{
|
2015-12-29 21:26:09 +00:00
|
|
|
if (ip < zc->base + zc->nextToUpdate) return 0; /* skipped area */
|
2016-02-15 16:06:29 +00:00
|
|
|
ZSTD_updateTree(zc, ip, iLimit, maxNbAttempts, mls);
|
2016-01-01 06:47:58 +00:00
|
|
|
return ZSTD_insertBtAndFindBestMatch(zc, ip, iLimit, offsetPtr, maxNbAttempts, mls, 0);
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-10 13:01:49 +00:00
|
|
|
static size_t ZSTD_BtFindBestMatch_selectMLS (
|
2015-11-11 12:43:58 +00:00
|
|
|
ZSTD_CCtx* zc, /* Index table will be updated */
|
2015-11-04 02:52:54 +00:00
|
|
|
const BYTE* ip, const BYTE* const iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
const U32 maxNbAttempts, const U32 matchLengthSearch)
|
|
|
|
{
|
|
|
|
switch(matchLengthSearch)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default : /* includes case 3 */
|
2015-11-11 12:43:58 +00:00
|
|
|
case 4 : return ZSTD_BtFindBestMatch(zc, ip, iLimit, offsetPtr, maxNbAttempts, 4);
|
|
|
|
case 5 : return ZSTD_BtFindBestMatch(zc, ip, iLimit, offsetPtr, maxNbAttempts, 5);
|
2017-03-29 21:32:15 +00:00
|
|
|
case 7 :
|
2015-11-11 12:43:58 +00:00
|
|
|
case 6 : return ZSTD_BtFindBestMatch(zc, ip, iLimit, offsetPtr, maxNbAttempts, 6);
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-15 16:06:29 +00:00
|
|
|
static void ZSTD_updateTree_extDict(ZSTD_CCtx* zc, const BYTE* const ip, const BYTE* const iend, const U32 nbCompares, const U32 mls)
|
|
|
|
{
|
|
|
|
const BYTE* const base = zc->base;
|
|
|
|
const U32 target = (U32)(ip - base);
|
|
|
|
U32 idx = zc->nextToUpdate;
|
|
|
|
|
|
|
|
while (idx < target) idx += ZSTD_insertBt1(zc, base+idx, mls, iend, nbCompares, 1);
|
|
|
|
}
|
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
|
2015-11-23 14:29:15 +00:00
|
|
|
/** Tree updater, providing best match */
|
2016-02-11 06:14:25 +00:00
|
|
|
static size_t ZSTD_BtFindBestMatch_extDict (
|
2015-11-23 14:29:15 +00:00
|
|
|
ZSTD_CCtx* zc,
|
|
|
|
const BYTE* const ip, const BYTE* const iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
const U32 maxNbAttempts, const U32 mls)
|
|
|
|
{
|
2015-12-29 21:26:09 +00:00
|
|
|
if (ip < zc->base + zc->nextToUpdate) return 0; /* skipped area */
|
2016-02-15 16:06:29 +00:00
|
|
|
ZSTD_updateTree_extDict(zc, ip, iLimit, maxNbAttempts, mls);
|
2016-01-01 06:47:58 +00:00
|
|
|
return ZSTD_insertBtAndFindBestMatch(zc, ip, iLimit, offsetPtr, maxNbAttempts, mls, 1);
|
2015-11-23 14:29:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-11 06:14:25 +00:00
|
|
|
static size_t ZSTD_BtFindBestMatch_selectMLS_extDict (
|
2015-11-23 14:29:15 +00:00
|
|
|
ZSTD_CCtx* zc, /* Index table will be updated */
|
|
|
|
const BYTE* ip, const BYTE* const iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
const U32 maxNbAttempts, const U32 matchLengthSearch)
|
|
|
|
{
|
|
|
|
switch(matchLengthSearch)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default : /* includes case 3 */
|
2015-11-23 14:29:15 +00:00
|
|
|
case 4 : return ZSTD_BtFindBestMatch_extDict(zc, ip, iLimit, offsetPtr, maxNbAttempts, 4);
|
|
|
|
case 5 : return ZSTD_BtFindBestMatch_extDict(zc, ip, iLimit, offsetPtr, maxNbAttempts, 5);
|
2017-03-29 21:32:15 +00:00
|
|
|
case 7 :
|
2015-11-23 14:29:15 +00:00
|
|
|
case 6 : return ZSTD_BtFindBestMatch_extDict(zc, ip, iLimit, offsetPtr, maxNbAttempts, 6);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-11-05 16:32:18 +00:00
|
|
|
|
2016-07-27 19:05:12 +00:00
|
|
|
/* *********************************
|
2016-04-07 17:14:09 +00:00
|
|
|
* Hash Chain
|
2016-07-27 19:05:12 +00:00
|
|
|
***********************************/
|
2016-04-07 17:14:09 +00:00
|
|
|
#define NEXT_IN_CHAIN(d, mask) chainTable[(d) & mask]
|
2015-11-05 14:00:24 +00:00
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
/* Update chains up to ip (excluded)
|
2017-02-20 20:08:59 +00:00
|
|
|
Assumption : always within prefix (i.e. not within extDict) */
|
2016-04-07 17:14:09 +00:00
|
|
|
FORCE_INLINE
|
|
|
|
U32 ZSTD_insertAndFindFirstIndex (ZSTD_CCtx* zc, const BYTE* ip, U32 mls)
|
|
|
|
{
|
|
|
|
U32* const hashTable = zc->hashTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 hashLog = zc->appliedParams.cParams.hashLog;
|
2016-04-07 17:14:09 +00:00
|
|
|
U32* const chainTable = zc->chainTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 chainMask = (1 << zc->appliedParams.cParams.chainLog) - 1;
|
2016-04-07 17:14:09 +00:00
|
|
|
const BYTE* const base = zc->base;
|
|
|
|
const U32 target = (U32)(ip - base);
|
|
|
|
U32 idx = zc->nextToUpdate;
|
2015-11-05 14:00:24 +00:00
|
|
|
|
2016-06-21 06:01:51 +00:00
|
|
|
while(idx < target) { /* catch up */
|
2016-04-07 17:14:09 +00:00
|
|
|
size_t const h = ZSTD_hashPtr(base+idx, hashLog, mls);
|
|
|
|
NEXT_IN_CHAIN(idx, chainMask) = hashTable[h];
|
|
|
|
hashTable[h] = idx;
|
|
|
|
idx++;
|
2015-11-23 13:37:59 +00:00
|
|
|
}
|
2016-04-07 17:14:09 +00:00
|
|
|
|
|
|
|
zc->nextToUpdate = target;
|
|
|
|
return hashTable[ZSTD_hashPtr(ip, hashLog, mls)];
|
2015-11-23 13:37:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-05-24 20:50:10 +00:00
|
|
|
/* inlining is important to hardwire a hot branch (template emulation) */
|
|
|
|
FORCE_INLINE
|
2016-04-07 17:14:09 +00:00
|
|
|
size_t ZSTD_HcFindBestMatch_generic (
|
|
|
|
ZSTD_CCtx* zc, /* Index table will be updated */
|
|
|
|
const BYTE* const ip, const BYTE* const iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
const U32 maxNbAttempts, const U32 mls, const U32 extDict)
|
2015-11-05 14:00:24 +00:00
|
|
|
{
|
2016-04-07 17:14:09 +00:00
|
|
|
U32* const chainTable = zc->chainTable;
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 chainSize = (1 << zc->appliedParams.cParams.chainLog);
|
2016-04-07 17:14:09 +00:00
|
|
|
const U32 chainMask = chainSize-1;
|
|
|
|
const BYTE* const base = zc->base;
|
|
|
|
const BYTE* const dictBase = zc->dictBase;
|
|
|
|
const U32 dictLimit = zc->dictLimit;
|
2016-04-05 17:01:10 +00:00
|
|
|
const BYTE* const prefixStart = base + dictLimit;
|
2016-04-07 17:14:09 +00:00
|
|
|
const BYTE* const dictEnd = dictBase + dictLimit;
|
|
|
|
const U32 lowLimit = zc->lowLimit;
|
|
|
|
const U32 current = (U32)(ip-base);
|
|
|
|
const U32 minChain = current > chainSize ? current - chainSize : 0;
|
|
|
|
int nbAttempts=maxNbAttempts;
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t ml=4-1;
|
2016-04-05 17:01:10 +00:00
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
/* HC4 match finder */
|
|
|
|
U32 matchIndex = ZSTD_insertAndFindFirstIndex (zc, ip, mls);
|
2016-04-05 17:01:10 +00:00
|
|
|
|
2016-06-21 06:01:51 +00:00
|
|
|
for ( ; (matchIndex>lowLimit) & (nbAttempts>0) ; nbAttempts--) {
|
2016-04-07 17:14:09 +00:00
|
|
|
const BYTE* match;
|
|
|
|
size_t currentMl=0;
|
|
|
|
if ((!extDict) || matchIndex >= dictLimit) {
|
|
|
|
match = base + matchIndex;
|
|
|
|
if (match[ml] == ip[ml]) /* potentially better */
|
|
|
|
currentMl = ZSTD_count(ip, match, iLimit);
|
|
|
|
} else {
|
|
|
|
match = dictBase + matchIndex;
|
|
|
|
if (MEM_read32(match) == MEM_read32(ip)) /* assumption : matchIndex <= dictLimit-4 (by table construction) */
|
2017-04-26 18:39:35 +00:00
|
|
|
currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dictEnd, prefixStart) + 4;
|
2016-04-07 17:14:09 +00:00
|
|
|
}
|
2016-04-05 17:01:10 +00:00
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
/* save best solution */
|
2017-04-20 19:50:02 +00:00
|
|
|
if (currentMl > ml) {
|
|
|
|
ml = currentMl;
|
|
|
|
*offsetPtr = current - matchIndex + ZSTD_REP_MOVE;
|
|
|
|
if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */
|
|
|
|
}
|
2016-04-05 17:01:10 +00:00
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
if (matchIndex <= minChain) break;
|
|
|
|
matchIndex = NEXT_IN_CHAIN(matchIndex, chainMask);
|
|
|
|
}
|
2016-04-05 17:01:10 +00:00
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
return ml;
|
|
|
|
}
|
2016-04-05 17:01:10 +00:00
|
|
|
|
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
FORCE_INLINE size_t ZSTD_HcFindBestMatch_selectMLS (
|
|
|
|
ZSTD_CCtx* zc,
|
|
|
|
const BYTE* ip, const BYTE* const iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
const U32 maxNbAttempts, const U32 matchLengthSearch)
|
|
|
|
{
|
|
|
|
switch(matchLengthSearch)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default : /* includes case 3 */
|
2016-04-07 17:14:09 +00:00
|
|
|
case 4 : return ZSTD_HcFindBestMatch_generic(zc, ip, iLimit, offsetPtr, maxNbAttempts, 4, 0);
|
|
|
|
case 5 : return ZSTD_HcFindBestMatch_generic(zc, ip, iLimit, offsetPtr, maxNbAttempts, 5, 0);
|
2017-03-29 21:32:15 +00:00
|
|
|
case 7 :
|
2016-04-07 17:14:09 +00:00
|
|
|
case 6 : return ZSTD_HcFindBestMatch_generic(zc, ip, iLimit, offsetPtr, maxNbAttempts, 6, 0);
|
|
|
|
}
|
|
|
|
}
|
2016-04-05 17:01:10 +00:00
|
|
|
|
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
FORCE_INLINE size_t ZSTD_HcFindBestMatch_extDict_selectMLS (
|
|
|
|
ZSTD_CCtx* zc,
|
|
|
|
const BYTE* ip, const BYTE* const iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
const U32 maxNbAttempts, const U32 matchLengthSearch)
|
|
|
|
{
|
|
|
|
switch(matchLengthSearch)
|
|
|
|
{
|
2017-03-29 21:32:15 +00:00
|
|
|
default : /* includes case 3 */
|
2016-04-07 17:14:09 +00:00
|
|
|
case 4 : return ZSTD_HcFindBestMatch_generic(zc, ip, iLimit, offsetPtr, maxNbAttempts, 4, 1);
|
|
|
|
case 5 : return ZSTD_HcFindBestMatch_generic(zc, ip, iLimit, offsetPtr, maxNbAttempts, 5, 1);
|
2017-03-29 21:32:15 +00:00
|
|
|
case 7 :
|
2016-04-07 17:14:09 +00:00
|
|
|
case 6 : return ZSTD_HcFindBestMatch_generic(zc, ip, iLimit, offsetPtr, maxNbAttempts, 6, 1);
|
2015-11-05 14:00:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-05 17:01:10 +00:00
|
|
|
|
2015-11-22 12:24:05 +00:00
|
|
|
/* *******************************
|
2015-11-22 01:53:43 +00:00
|
|
|
* Common parser - lazy strategy
|
2015-11-22 12:24:05 +00:00
|
|
|
*********************************/
|
2015-11-05 14:00:24 +00:00
|
|
|
FORCE_INLINE
|
2016-01-23 18:28:41 +00:00
|
|
|
void ZSTD_compressBlock_lazy_generic(ZSTD_CCtx* ctx,
|
|
|
|
const void* src, size_t srcSize,
|
2015-11-22 01:42:28 +00:00
|
|
|
const U32 searchMethod, const U32 depth)
|
2015-11-04 02:52:54 +00:00
|
|
|
{
|
|
|
|
seqStore_t* seqStorePtr = &(ctx->seqStore);
|
|
|
|
const BYTE* const istart = (const BYTE*)src;
|
|
|
|
const BYTE* ip = istart;
|
|
|
|
const BYTE* anchor = istart;
|
|
|
|
const BYTE* const iend = istart + srcSize;
|
|
|
|
const BYTE* const ilimit = iend - 8;
|
2015-12-05 08:23:53 +00:00
|
|
|
const BYTE* const base = ctx->base + ctx->dictLimit;
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const maxSearches = 1 << ctx->appliedParams.cParams.searchLog;
|
|
|
|
U32 const mls = ctx->appliedParams.cParams.searchLength;
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2015-11-11 12:43:58 +00:00
|
|
|
typedef size_t (*searchMax_f)(ZSTD_CCtx* zc, const BYTE* ip, const BYTE* iLimit,
|
2015-11-05 14:00:24 +00:00
|
|
|
size_t* offsetPtr,
|
|
|
|
U32 maxNbAttempts, U32 matchLengthSearch);
|
2016-06-13 19:43:06 +00:00
|
|
|
searchMax_f const searchMax = searchMethod ? ZSTD_BtFindBestMatch_selectMLS : ZSTD_HcFindBestMatch_selectMLS;
|
2016-07-02 23:23:58 +00:00
|
|
|
U32 offset_1 = ctx->rep[0], offset_2 = ctx->rep[1], savedOffset=0;
|
2016-03-16 11:57:07 +00:00
|
|
|
|
2016-06-13 23:49:25 +00:00
|
|
|
/* init */
|
|
|
|
ip += (ip==base);
|
2016-04-06 10:34:42 +00:00
|
|
|
ctx->nextToUpdate3 = ctx->nextToUpdate;
|
2016-07-02 23:23:58 +00:00
|
|
|
{ U32 const maxRep = (U32)(ip-base);
|
|
|
|
if (offset_2 > maxRep) savedOffset = offset_2, offset_2 = 0;
|
|
|
|
if (offset_1 > maxRep) savedOffset = offset_1, offset_1 = 0;
|
|
|
|
}
|
2015-11-04 02:52:54 +00:00
|
|
|
|
|
|
|
/* Match Loop */
|
2016-01-27 23:18:06 +00:00
|
|
|
while (ip < ilimit) {
|
2015-11-21 14:27:35 +00:00
|
|
|
size_t matchLength=0;
|
|
|
|
size_t offset=0;
|
2016-04-07 17:14:09 +00:00
|
|
|
const BYTE* start=ip+1;
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2015-11-20 11:03:53 +00:00
|
|
|
/* check repCode */
|
2016-07-02 23:23:58 +00:00
|
|
|
if ((offset_1>0) & (MEM_read32(ip+1) == MEM_read32(ip+1 - offset_1))) {
|
2015-11-20 11:03:53 +00:00
|
|
|
/* repcode : we take it */
|
2017-04-26 18:39:35 +00:00
|
|
|
matchLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
|
2016-04-07 17:14:09 +00:00
|
|
|
if (depth==0) goto _storeSequence;
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
|
|
|
|
2016-03-19 17:08:32 +00:00
|
|
|
/* first search (depth 0) */
|
|
|
|
{ size_t offsetFound = 99999999;
|
|
|
|
size_t const ml2 = searchMax(ctx, ip, iend, &offsetFound, maxSearches, mls);
|
2015-11-23 15:17:21 +00:00
|
|
|
if (ml2 > matchLength)
|
|
|
|
matchLength = ml2, start = ip, offset=offsetFound;
|
|
|
|
}
|
|
|
|
|
2017-04-26 18:39:35 +00:00
|
|
|
if (matchLength < 4) {
|
2015-11-23 15:17:21 +00:00
|
|
|
ip += ((ip-anchor) >> g_searchStrength) + 1; /* jump faster over incompressible sections */
|
|
|
|
continue;
|
|
|
|
}
|
2015-11-04 02:52:54 +00:00
|
|
|
|
|
|
|
/* let's try to find a better solution */
|
2015-11-22 01:42:28 +00:00
|
|
|
if (depth>=1)
|
2016-01-27 23:18:06 +00:00
|
|
|
while (ip<ilimit) {
|
2015-11-04 02:52:54 +00:00
|
|
|
ip ++;
|
2016-07-02 23:23:58 +00:00
|
|
|
if ((offset) && ((offset_1>0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) {
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const mlRep = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4;
|
2016-03-19 17:08:32 +00:00
|
|
|
int const gain2 = (int)(mlRep * 3);
|
2016-06-04 18:17:38 +00:00
|
|
|
int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((mlRep >= 4) && (gain2 > gain1))
|
2016-04-07 17:14:09 +00:00
|
|
|
matchLength = mlRep, offset = 0, start = ip;
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
2016-03-19 17:08:32 +00:00
|
|
|
{ size_t offset2=99999999;
|
|
|
|
size_t const ml2 = searchMax(ctx, ip, iend, &offset2, maxSearches, mls);
|
2016-06-04 18:17:38 +00:00
|
|
|
int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1)); /* raw approx */
|
|
|
|
int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 4);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((ml2 >= 4) && (gain2 > gain1)) {
|
2015-11-06 17:44:54 +00:00
|
|
|
matchLength = ml2, offset = offset2, start = ip;
|
2015-11-04 02:52:54 +00:00
|
|
|
continue; /* search a better one */
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-04 02:52:54 +00:00
|
|
|
|
|
|
|
/* let's find an even better one */
|
2016-01-27 23:18:06 +00:00
|
|
|
if ((depth==2) && (ip<ilimit)) {
|
2015-11-04 02:52:54 +00:00
|
|
|
ip ++;
|
2016-07-02 23:23:58 +00:00
|
|
|
if ((offset) && ((offset_1>0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) {
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const ml2 = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4;
|
2016-03-19 17:08:32 +00:00
|
|
|
int const gain2 = (int)(ml2 * 4);
|
2016-06-04 18:17:38 +00:00
|
|
|
int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((ml2 >= 4) && (gain2 > gain1))
|
2016-04-07 17:14:09 +00:00
|
|
|
matchLength = ml2, offset = 0, start = ip;
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
2016-03-19 17:08:32 +00:00
|
|
|
{ size_t offset2=99999999;
|
|
|
|
size_t const ml2 = searchMax(ctx, ip, iend, &offset2, maxSearches, mls);
|
2016-06-04 18:17:38 +00:00
|
|
|
int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1)); /* raw approx */
|
|
|
|
int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 7);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((ml2 >= 4) && (gain2 > gain1)) {
|
2015-11-06 17:44:54 +00:00
|
|
|
matchLength = ml2, offset = offset2, start = ip;
|
|
|
|
continue;
|
2016-01-27 23:18:06 +00:00
|
|
|
} } }
|
2015-11-04 02:52:54 +00:00
|
|
|
break; /* nothing found : store previous solution */
|
|
|
|
}
|
|
|
|
|
2016-02-16 16:41:03 +00:00
|
|
|
/* catch up */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (offset) {
|
2017-04-20 19:50:02 +00:00
|
|
|
while ( (start > anchor)
|
|
|
|
&& (start > base+offset-ZSTD_REP_MOVE)
|
|
|
|
&& (start[-1] == start[-1-offset+ZSTD_REP_MOVE]) ) /* only search for offset within prefix */
|
2015-11-09 02:19:33 +00:00
|
|
|
{ start--; matchLength++; }
|
2016-07-02 23:23:58 +00:00
|
|
|
offset_2 = offset_1; offset_1 = (U32)(offset - ZSTD_REP_MOVE);
|
2015-11-09 02:19:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* store sequence */
|
2016-04-07 17:14:09 +00:00
|
|
|
_storeSequence:
|
|
|
|
{ size_t const litLength = start - anchor;
|
2016-07-02 23:48:26 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, litLength, anchor, (U32)offset, matchLength-MINMATCH);
|
2015-11-09 02:19:33 +00:00
|
|
|
anchor = ip = start + matchLength;
|
2015-11-04 02:52:54 +00:00
|
|
|
}
|
2016-04-07 17:14:09 +00:00
|
|
|
|
|
|
|
/* check immediate repcode */
|
|
|
|
while ( (ip <= ilimit)
|
2016-07-02 23:23:58 +00:00
|
|
|
&& ((offset_2>0)
|
|
|
|
& (MEM_read32(ip) == MEM_read32(ip - offset_2)) )) {
|
2016-04-07 17:14:09 +00:00
|
|
|
/* store sequence */
|
2017-04-26 18:39:35 +00:00
|
|
|
matchLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
|
2016-07-02 23:23:58 +00:00
|
|
|
offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset; /* swap repcodes */
|
2016-04-07 17:14:09 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, matchLength-MINMATCH);
|
|
|
|
ip += matchLength;
|
|
|
|
anchor = ip;
|
|
|
|
continue; /* faster when present ... (?) */
|
|
|
|
} }
|
2015-11-04 02:52:54 +00:00
|
|
|
|
2016-06-13 23:49:25 +00:00
|
|
|
/* Save reps for next block */
|
2017-01-20 01:33:37 +00:00
|
|
|
ctx->repToConfirm[0] = offset_1 ? offset_1 : savedOffset;
|
|
|
|
ctx->repToConfirm[1] = offset_2 ? offset_2 : savedOffset;
|
2016-06-13 23:49:25 +00:00
|
|
|
|
2015-11-04 02:52:54 +00:00
|
|
|
/* Last Literals */
|
2016-03-19 17:08:32 +00:00
|
|
|
{ size_t const lastLLSize = iend - anchor;
|
2015-11-04 02:52:54 +00:00
|
|
|
memcpy(seqStorePtr->lit, anchor, lastLLSize);
|
|
|
|
seqStorePtr->lit += lastLLSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-31 10:25:48 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
static void ZSTD_compressBlock_btlazy2(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-10-22 14:31:46 +00:00
|
|
|
{
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_lazy_generic(ctx, src, srcSize, 1, 2);
|
2015-11-05 14:00:24 +00:00
|
|
|
}
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
static void ZSTD_compressBlock_lazy2(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-11-05 14:00:24 +00:00
|
|
|
{
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_lazy_generic(ctx, src, srcSize, 0, 2);
|
2015-11-05 14:00:24 +00:00
|
|
|
}
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
static void ZSTD_compressBlock_lazy(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-11-05 14:00:24 +00:00
|
|
|
{
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_lazy_generic(ctx, src, srcSize, 0, 1);
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
static void ZSTD_compressBlock_greedy(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-10-31 11:57:14 +00:00
|
|
|
{
|
2016-04-07 17:14:09 +00:00
|
|
|
ZSTD_compressBlock_lazy_generic(ctx, src, srcSize, 0, 0);
|
2015-10-31 11:57:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-11-22 01:53:43 +00:00
|
|
|
FORCE_INLINE
|
2016-01-23 18:28:41 +00:00
|
|
|
void ZSTD_compressBlock_lazy_extDict_generic(ZSTD_CCtx* ctx,
|
|
|
|
const void* src, size_t srcSize,
|
2015-11-22 01:53:43 +00:00
|
|
|
const U32 searchMethod, const U32 depth)
|
|
|
|
{
|
|
|
|
seqStore_t* seqStorePtr = &(ctx->seqStore);
|
|
|
|
const BYTE* const istart = (const BYTE*)src;
|
|
|
|
const BYTE* ip = istart;
|
|
|
|
const BYTE* anchor = istart;
|
|
|
|
const BYTE* const iend = istart + srcSize;
|
|
|
|
const BYTE* const ilimit = iend - 8;
|
|
|
|
const BYTE* const base = ctx->base;
|
|
|
|
const U32 dictLimit = ctx->dictLimit;
|
2016-06-13 19:43:06 +00:00
|
|
|
const U32 lowestIndex = ctx->lowLimit;
|
2015-11-22 01:53:43 +00:00
|
|
|
const BYTE* const prefixStart = base + dictLimit;
|
|
|
|
const BYTE* const dictBase = ctx->dictBase;
|
|
|
|
const BYTE* const dictEnd = dictBase + dictLimit;
|
2015-11-24 13:06:07 +00:00
|
|
|
const BYTE* const dictStart = dictBase + ctx->lowLimit;
|
2015-11-22 01:53:43 +00:00
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
const U32 maxSearches = 1 << ctx->appliedParams.cParams.searchLog;
|
|
|
|
const U32 mls = ctx->appliedParams.cParams.searchLength;
|
2015-11-22 01:53:43 +00:00
|
|
|
|
|
|
|
typedef size_t (*searchMax_f)(ZSTD_CCtx* zc, const BYTE* ip, const BYTE* iLimit,
|
|
|
|
size_t* offsetPtr,
|
|
|
|
U32 maxNbAttempts, U32 matchLengthSearch);
|
2015-11-23 14:29:15 +00:00
|
|
|
searchMax_f searchMax = searchMethod ? ZSTD_BtFindBestMatch_selectMLS_extDict : ZSTD_HcFindBestMatch_extDict_selectMLS;
|
2015-11-22 01:53:43 +00:00
|
|
|
|
2016-07-02 23:28:16 +00:00
|
|
|
U32 offset_1 = ctx->rep[0], offset_2 = ctx->rep[1];
|
2016-04-05 16:16:38 +00:00
|
|
|
|
2016-07-02 23:28:16 +00:00
|
|
|
/* init */
|
2016-04-06 10:34:42 +00:00
|
|
|
ctx->nextToUpdate3 = ctx->nextToUpdate;
|
2016-06-13 23:49:25 +00:00
|
|
|
ip += (ip == prefixStart);
|
2015-11-22 01:53:43 +00:00
|
|
|
|
|
|
|
/* Match Loop */
|
2016-01-27 23:18:06 +00:00
|
|
|
while (ip < ilimit) {
|
2015-11-22 01:53:43 +00:00
|
|
|
size_t matchLength=0;
|
|
|
|
size_t offset=0;
|
2016-04-07 17:14:09 +00:00
|
|
|
const BYTE* start=ip+1;
|
2015-11-22 01:53:43 +00:00
|
|
|
U32 current = (U32)(ip-base);
|
|
|
|
|
|
|
|
/* check repCode */
|
2016-07-02 23:28:16 +00:00
|
|
|
{ const U32 repIndex = (U32)(current+1 - offset_1);
|
2015-11-22 01:53:43 +00:00
|
|
|
const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* const repMatch = repBase + repIndex;
|
2016-06-13 19:43:06 +00:00
|
|
|
if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex)) /* intentional overflow */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (MEM_read32(ip+1) == MEM_read32(repMatch)) {
|
2015-11-22 01:53:43 +00:00
|
|
|
/* repcode detected we should take it */
|
|
|
|
const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
|
2017-04-26 18:39:35 +00:00
|
|
|
matchLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repEnd, prefixStart) + 4;
|
2016-04-07 17:14:09 +00:00
|
|
|
if (depth==0) goto _storeSequence;
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-22 01:53:43 +00:00
|
|
|
|
2016-03-19 17:08:32 +00:00
|
|
|
/* first search (depth 0) */
|
|
|
|
{ size_t offsetFound = 99999999;
|
|
|
|
size_t const ml2 = searchMax(ctx, ip, iend, &offsetFound, maxSearches, mls);
|
2015-11-23 15:17:21 +00:00
|
|
|
if (ml2 > matchLength)
|
|
|
|
matchLength = ml2, start = ip, offset=offsetFound;
|
|
|
|
}
|
|
|
|
|
2017-04-26 18:39:35 +00:00
|
|
|
if (matchLength < 4) {
|
2015-11-23 15:17:21 +00:00
|
|
|
ip += ((ip-anchor) >> g_searchStrength) + 1; /* jump faster over incompressible sections */
|
|
|
|
continue;
|
|
|
|
}
|
2015-11-22 01:53:43 +00:00
|
|
|
|
|
|
|
/* let's try to find a better solution */
|
|
|
|
if (depth>=1)
|
2016-01-27 23:18:06 +00:00
|
|
|
while (ip<ilimit) {
|
2015-11-22 01:53:43 +00:00
|
|
|
ip ++;
|
|
|
|
current++;
|
|
|
|
/* check repCode */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (offset) {
|
2016-07-02 23:28:16 +00:00
|
|
|
const U32 repIndex = (U32)(current - offset_1);
|
2015-11-22 01:53:43 +00:00
|
|
|
const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* const repMatch = repBase + repIndex;
|
2016-06-13 19:43:06 +00:00
|
|
|
if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex)) /* intentional overflow */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (MEM_read32(ip) == MEM_read32(repMatch)) {
|
2015-11-22 01:53:43 +00:00
|
|
|
/* repcode detected */
|
|
|
|
const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
|
2016-03-19 17:08:32 +00:00
|
|
|
int const gain2 = (int)(repLength * 3);
|
2016-06-04 18:17:38 +00:00
|
|
|
int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((repLength >= 4) && (gain2 > gain1))
|
2016-04-07 17:14:09 +00:00
|
|
|
matchLength = repLength, offset = 0, start = ip;
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-22 01:53:43 +00:00
|
|
|
|
|
|
|
/* search match, depth 1 */
|
2016-03-19 17:08:32 +00:00
|
|
|
{ size_t offset2=99999999;
|
|
|
|
size_t const ml2 = searchMax(ctx, ip, iend, &offset2, maxSearches, mls);
|
2016-06-04 18:17:38 +00:00
|
|
|
int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1)); /* raw approx */
|
|
|
|
int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 4);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((ml2 >= 4) && (gain2 > gain1)) {
|
2015-11-22 01:53:43 +00:00
|
|
|
matchLength = ml2, offset = offset2, start = ip;
|
|
|
|
continue; /* search a better one */
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-22 01:53:43 +00:00
|
|
|
|
|
|
|
/* let's find an even better one */
|
2016-01-27 23:18:06 +00:00
|
|
|
if ((depth==2) && (ip<ilimit)) {
|
2015-11-22 01:53:43 +00:00
|
|
|
ip ++;
|
|
|
|
current++;
|
|
|
|
/* check repCode */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (offset) {
|
2016-07-02 23:28:16 +00:00
|
|
|
const U32 repIndex = (U32)(current - offset_1);
|
2015-11-22 01:53:43 +00:00
|
|
|
const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* const repMatch = repBase + repIndex;
|
2016-06-13 19:43:06 +00:00
|
|
|
if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex)) /* intentional overflow */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (MEM_read32(ip) == MEM_read32(repMatch)) {
|
2015-11-22 01:53:43 +00:00
|
|
|
/* repcode detected */
|
|
|
|
const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
|
2017-04-26 18:39:35 +00:00
|
|
|
size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
|
2017-04-20 19:50:02 +00:00
|
|
|
int const gain2 = (int)(repLength * 4);
|
|
|
|
int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((repLength >= 4) && (gain2 > gain1))
|
2016-04-07 17:14:09 +00:00
|
|
|
matchLength = repLength, offset = 0, start = ip;
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-22 01:53:43 +00:00
|
|
|
|
|
|
|
/* search match, depth 2 */
|
2016-03-19 17:08:32 +00:00
|
|
|
{ size_t offset2=99999999;
|
|
|
|
size_t const ml2 = searchMax(ctx, ip, iend, &offset2, maxSearches, mls);
|
2016-06-04 18:17:38 +00:00
|
|
|
int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1)); /* raw approx */
|
|
|
|
int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 7);
|
2017-04-26 18:39:35 +00:00
|
|
|
if ((ml2 >= 4) && (gain2 > gain1)) {
|
2015-11-22 01:53:43 +00:00
|
|
|
matchLength = ml2, offset = offset2, start = ip;
|
|
|
|
continue;
|
2016-01-27 23:18:06 +00:00
|
|
|
} } }
|
2015-11-22 01:53:43 +00:00
|
|
|
break; /* nothing found : store previous solution */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* catch up */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (offset) {
|
2016-05-31 16:13:56 +00:00
|
|
|
U32 const matchIndex = (U32)((start-base) - (offset - ZSTD_REP_MOVE));
|
2015-11-24 13:06:07 +00:00
|
|
|
const BYTE* match = (matchIndex < dictLimit) ? dictBase + matchIndex : base + matchIndex;
|
|
|
|
const BYTE* const mStart = (matchIndex < dictLimit) ? dictStart : prefixStart;
|
|
|
|
while ((start>anchor) && (match>mStart) && (start[-1] == match[-1])) { start--; match--; matchLength++; } /* catch up */
|
2016-07-02 23:28:16 +00:00
|
|
|
offset_2 = offset_1; offset_1 = (U32)(offset - ZSTD_REP_MOVE);
|
2015-11-22 01:53:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* store sequence */
|
2016-04-07 17:14:09 +00:00
|
|
|
_storeSequence:
|
|
|
|
{ size_t const litLength = start - anchor;
|
2016-07-02 23:48:26 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, litLength, anchor, (U32)offset, matchLength-MINMATCH);
|
2016-04-05 16:16:38 +00:00
|
|
|
anchor = ip = start + matchLength;
|
2016-04-07 17:14:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check immediate repcode */
|
|
|
|
while (ip <= ilimit) {
|
2016-07-02 23:28:16 +00:00
|
|
|
const U32 repIndex = (U32)((ip-base) - offset_2);
|
2016-04-07 17:14:09 +00:00
|
|
|
const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
|
|
|
|
const BYTE* const repMatch = repBase + repIndex;
|
2016-06-13 19:43:06 +00:00
|
|
|
if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex)) /* intentional overflow */
|
2016-04-07 17:14:09 +00:00
|
|
|
if (MEM_read32(ip) == MEM_read32(repMatch)) {
|
|
|
|
/* repcode detected we should take it */
|
|
|
|
const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
|
2017-04-26 18:39:35 +00:00
|
|
|
matchLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
|
2016-07-02 23:28:16 +00:00
|
|
|
offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset; /* swap offset history */
|
2016-04-07 17:14:09 +00:00
|
|
|
ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, matchLength-MINMATCH);
|
|
|
|
ip += matchLength;
|
|
|
|
anchor = ip;
|
|
|
|
continue; /* faster when present ... (?) */
|
|
|
|
}
|
|
|
|
break;
|
2016-01-27 23:18:06 +00:00
|
|
|
} }
|
2015-11-22 01:53:43 +00:00
|
|
|
|
2016-06-13 23:49:25 +00:00
|
|
|
/* Save reps for next block */
|
2017-01-20 01:33:37 +00:00
|
|
|
ctx->repToConfirm[0] = offset_1; ctx->repToConfirm[1] = offset_2;
|
2016-06-13 23:49:25 +00:00
|
|
|
|
2015-11-22 01:53:43 +00:00
|
|
|
/* Last Literals */
|
2016-03-20 15:00:00 +00:00
|
|
|
{ size_t const lastLLSize = iend - anchor;
|
2015-11-22 01:53:43 +00:00
|
|
|
memcpy(seqStorePtr->lit, anchor, lastLLSize);
|
|
|
|
seqStorePtr->lit += lastLLSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-07 17:14:09 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
void ZSTD_compressBlock_greedy_extDict(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-11-22 01:53:43 +00:00
|
|
|
{
|
2016-04-07 17:14:09 +00:00
|
|
|
ZSTD_compressBlock_lazy_extDict_generic(ctx, src, srcSize, 0, 0);
|
2015-11-22 01:53:43 +00:00
|
|
|
}
|
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
static void ZSTD_compressBlock_lazy_extDict(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-11-22 02:12:28 +00:00
|
|
|
{
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_lazy_extDict_generic(ctx, src, srcSize, 0, 1);
|
2015-11-22 02:12:28 +00:00
|
|
|
}
|
2015-11-22 01:53:43 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
static void ZSTD_compressBlock_lazy2_extDict(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-11-22 11:22:04 +00:00
|
|
|
{
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_lazy_extDict_generic(ctx, src, srcSize, 0, 2);
|
2015-11-22 11:22:04 +00:00
|
|
|
}
|
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
static void ZSTD_compressBlock_btlazy2_extDict(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2015-11-23 12:34:21 +00:00
|
|
|
{
|
2016-01-25 03:22:03 +00:00
|
|
|
ZSTD_compressBlock_lazy_extDict_generic(ctx, src, srcSize, 1, 2);
|
2015-11-23 12:34:21 +00:00
|
|
|
}
|
|
|
|
|
2016-04-21 09:08:43 +00:00
|
|
|
|
|
|
|
/* The optimal parser */
|
|
|
|
#include "zstd_opt.h"
|
|
|
|
|
|
|
|
static void ZSTD_compressBlock_btopt(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
|
|
|
{
|
2016-06-26 23:31:35 +00:00
|
|
|
#ifdef ZSTD_OPT_H_91842398743
|
2016-10-25 10:25:07 +00:00
|
|
|
ZSTD_compressBlock_opt_generic(ctx, src, srcSize, 0);
|
|
|
|
#else
|
|
|
|
(void)ctx; (void)src; (void)srcSize;
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-03-09 19:44:25 +00:00
|
|
|
static void ZSTD_compressBlock_btultra(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2016-10-25 10:25:07 +00:00
|
|
|
{
|
|
|
|
#ifdef ZSTD_OPT_H_91842398743
|
|
|
|
ZSTD_compressBlock_opt_generic(ctx, src, srcSize, 1);
|
2016-06-26 23:31:35 +00:00
|
|
|
#else
|
|
|
|
(void)ctx; (void)src; (void)srcSize;
|
|
|
|
return;
|
|
|
|
#endif
|
2016-04-21 09:08:43 +00:00
|
|
|
}
|
|
|
|
|
2016-02-22 09:06:17 +00:00
|
|
|
static void ZSTD_compressBlock_btopt_extDict(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2016-01-31 10:25:48 +00:00
|
|
|
{
|
2016-06-26 23:31:35 +00:00
|
|
|
#ifdef ZSTD_OPT_H_91842398743
|
2016-10-25 10:25:07 +00:00
|
|
|
ZSTD_compressBlock_opt_extDict_generic(ctx, src, srcSize, 0);
|
|
|
|
#else
|
|
|
|
(void)ctx; (void)src; (void)srcSize;
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-03-09 19:44:25 +00:00
|
|
|
static void ZSTD_compressBlock_btultra_extDict(ZSTD_CCtx* ctx, const void* src, size_t srcSize)
|
2016-10-25 10:25:07 +00:00
|
|
|
{
|
|
|
|
#ifdef ZSTD_OPT_H_91842398743
|
|
|
|
ZSTD_compressBlock_opt_extDict_generic(ctx, src, srcSize, 1);
|
2016-06-26 23:31:35 +00:00
|
|
|
#else
|
|
|
|
(void)ctx; (void)src; (void)srcSize;
|
|
|
|
return;
|
|
|
|
#endif
|
2016-01-31 10:25:48 +00:00
|
|
|
}
|
|
|
|
|
2015-11-21 14:27:35 +00:00
|
|
|
|
2016-01-23 18:28:41 +00:00
|
|
|
typedef void (*ZSTD_blockCompressor) (ZSTD_CCtx* ctx, const void* src, size_t srcSize);
|
2015-11-04 11:05:27 +00:00
|
|
|
|
2016-01-26 02:14:20 +00:00
|
|
|
static ZSTD_blockCompressor ZSTD_selectBlockCompressor(ZSTD_strategy strat, int extDict)
|
2015-10-31 11:57:14 +00:00
|
|
|
{
|
2017-05-12 23:29:19 +00:00
|
|
|
static const ZSTD_blockCompressor blockCompressor[2][(unsigned)ZSTD_btultra+1] = {
|
|
|
|
{ NULL,
|
|
|
|
ZSTD_compressBlock_fast, ZSTD_compressBlock_doubleFast, ZSTD_compressBlock_greedy,
|
2017-04-20 19:50:02 +00:00
|
|
|
ZSTD_compressBlock_lazy, ZSTD_compressBlock_lazy2, ZSTD_compressBlock_btlazy2,
|
2017-05-10 23:49:58 +00:00
|
|
|
ZSTD_compressBlock_btopt, ZSTD_compressBlock_btultra },
|
2017-05-12 23:29:19 +00:00
|
|
|
{ NULL,
|
|
|
|
ZSTD_compressBlock_fast_extDict, ZSTD_compressBlock_doubleFast_extDict, ZSTD_compressBlock_greedy_extDict,
|
2017-04-20 19:50:02 +00:00
|
|
|
ZSTD_compressBlock_lazy_extDict,ZSTD_compressBlock_lazy2_extDict, ZSTD_compressBlock_btlazy2_extDict,
|
2017-05-10 23:49:58 +00:00
|
|
|
ZSTD_compressBlock_btopt_extDict, ZSTD_compressBlock_btultra_extDict }
|
2015-11-29 01:38:09 +00:00
|
|
|
};
|
2017-05-12 23:29:19 +00:00
|
|
|
ZSTD_STATIC_ASSERT((unsigned)ZSTD_fast == 1);
|
2015-11-29 01:38:09 +00:00
|
|
|
|
|
|
|
return blockCompressor[extDict][(U32)strat];
|
2015-10-31 11:57:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
static size_t ZSTD_compressBlock_internal(ZSTD_CCtx* zc, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
2015-11-04 11:05:27 +00:00
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_blockCompressor const blockCompressor = ZSTD_selectBlockCompressor(zc->appliedParams.cParams.strategy, zc->lowLimit < zc->dictLimit);
|
2016-08-10 13:00:30 +00:00
|
|
|
const BYTE* const base = zc->base;
|
|
|
|
const BYTE* const istart = (const BYTE*)src;
|
|
|
|
const U32 current = (U32)(istart-base);
|
2016-02-02 13:36:49 +00:00
|
|
|
if (srcSize < MIN_CBLOCK_SIZE+ZSTD_blockHeaderSize+1) return 0; /* don't even attempt compression below a certain srcSize */
|
2016-06-17 10:54:52 +00:00
|
|
|
ZSTD_resetSeqStore(&(zc->seqStore));
|
2016-08-10 13:00:30 +00:00
|
|
|
if (current > zc->nextToUpdate + 384)
|
2017-04-20 19:50:02 +00:00
|
|
|
zc->nextToUpdate = current - MIN(192, (U32)(current - zc->nextToUpdate - 384)); /* limited update after finding a very long match */
|
2016-01-23 18:28:41 +00:00
|
|
|
blockCompressor(zc, src, srcSize);
|
2016-03-15 00:24:33 +00:00
|
|
|
return ZSTD_compressSequences(zc, dst, dstCapacity, srcSize);
|
2015-11-04 11:05:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-05-12 20:46:49 +00:00
|
|
|
/*! ZSTD_compress_frameChunk() :
|
2016-07-27 22:55:43 +00:00
|
|
|
* Compress a chunk of data into one or multiple blocks.
|
|
|
|
* All blocks will be terminated, all input will be consumed.
|
|
|
|
* Function will issue an error if there is not enough `dstCapacity` to hold the compressed content.
|
|
|
|
* Frame is supposed already started (header already produced)
|
|
|
|
* @return : compressed size, or an error code
|
|
|
|
*/
|
2017-05-12 20:46:49 +00:00
|
|
|
static size_t ZSTD_compress_frameChunk (ZSTD_CCtx* cctx,
|
2016-05-31 16:13:56 +00:00
|
|
|
void* dst, size_t dstCapacity,
|
2016-07-27 22:55:43 +00:00
|
|
|
const void* src, size_t srcSize,
|
|
|
|
U32 lastFrameChunk)
|
2015-10-22 14:31:46 +00:00
|
|
|
{
|
2016-05-31 16:13:56 +00:00
|
|
|
size_t blockSize = cctx->blockSize;
|
2015-10-22 14:31:46 +00:00
|
|
|
size_t remaining = srcSize;
|
|
|
|
const BYTE* ip = (const BYTE*)src;
|
|
|
|
BYTE* const ostart = (BYTE*)dst;
|
|
|
|
BYTE* op = ostart;
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const maxDist = 1 << cctx->appliedParams.cParams.windowLog;
|
2015-11-01 11:40:22 +00:00
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
if (cctx->appliedParams.fParams.checksumFlag && srcSize)
|
2016-05-31 16:13:56 +00:00
|
|
|
XXH64_update(&cctx->xxhState, src, srcSize);
|
|
|
|
|
2016-02-02 13:36:49 +00:00
|
|
|
while (remaining) {
|
2016-07-27 22:55:43 +00:00
|
|
|
U32 const lastBlock = lastFrameChunk & (blockSize >= remaining);
|
2015-11-04 17:19:39 +00:00
|
|
|
size_t cSize;
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2017-04-20 19:50:02 +00:00
|
|
|
if (dstCapacity < ZSTD_blockHeaderSize + MIN_CBLOCK_SIZE)
|
|
|
|
return ERROR(dstSize_tooSmall); /* not enough space to store compressed block */
|
2015-11-04 17:19:39 +00:00
|
|
|
if (remaining < blockSize) blockSize = remaining;
|
2015-11-13 10:27:46 +00:00
|
|
|
|
2016-08-02 12:26:00 +00:00
|
|
|
/* preemptive overflow correction */
|
2017-03-08 00:52:23 +00:00
|
|
|
if (cctx->lowLimit > (3U<<29)) {
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const cycleMask = (1 << ZSTD_cycleLog(cctx->appliedParams.cParams.hashLog, cctx->appliedParams.cParams.strategy)) - 1;
|
2016-12-11 23:25:07 +00:00
|
|
|
U32 const current = (U32)(ip - cctx->base);
|
2017-05-23 00:06:04 +00:00
|
|
|
U32 const newCurrent = (current & cycleMask) + (1 << cctx->appliedParams.cParams.windowLog);
|
2016-12-11 23:25:07 +00:00
|
|
|
U32 const correction = current - newCurrent;
|
|
|
|
ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX_64 <= 30);
|
2016-08-02 12:26:00 +00:00
|
|
|
ZSTD_reduceIndex(cctx, correction);
|
|
|
|
cctx->base += correction;
|
|
|
|
cctx->dictBase += correction;
|
2016-12-11 23:25:07 +00:00
|
|
|
cctx->lowLimit -= correction;
|
2016-08-02 12:26:00 +00:00
|
|
|
cctx->dictLimit -= correction;
|
|
|
|
if (cctx->nextToUpdate < correction) cctx->nextToUpdate = 0;
|
|
|
|
else cctx->nextToUpdate -= correction;
|
|
|
|
}
|
|
|
|
|
2017-01-26 00:39:03 +00:00
|
|
|
if ((U32)(ip+blockSize - cctx->base) > cctx->loadedDictEnd + maxDist) {
|
2016-03-19 17:08:32 +00:00
|
|
|
/* enforce maxDist */
|
2016-05-31 16:13:56 +00:00
|
|
|
U32 const newLowLimit = (U32)(ip+blockSize - cctx->base) - maxDist;
|
|
|
|
if (cctx->lowLimit < newLowLimit) cctx->lowLimit = newLowLimit;
|
|
|
|
if (cctx->dictLimit < cctx->lowLimit) cctx->dictLimit = cctx->lowLimit;
|
2015-11-24 13:06:07 +00:00
|
|
|
}
|
2015-11-13 10:27:46 +00:00
|
|
|
|
2016-05-31 16:13:56 +00:00
|
|
|
cSize = ZSTD_compressBlock_internal(cctx, op+ZSTD_blockHeaderSize, dstCapacity-ZSTD_blockHeaderSize, ip, blockSize);
|
2016-05-24 13:36:37 +00:00
|
|
|
if (ZSTD_isError(cSize)) return cSize;
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2016-02-02 13:36:49 +00:00
|
|
|
if (cSize == 0) { /* block is not compressible */
|
2016-07-27 22:55:43 +00:00
|
|
|
U32 const cBlockHeader24 = lastBlock + (((U32)bt_raw)<<1) + (U32)(blockSize << 3);
|
|
|
|
if (blockSize + ZSTD_blockHeaderSize > dstCapacity) return ERROR(dstSize_tooSmall);
|
|
|
|
MEM_writeLE32(op, cBlockHeader24); /* no pb, 4th byte will be overwritten */
|
|
|
|
memcpy(op + ZSTD_blockHeaderSize, ip, blockSize);
|
|
|
|
cSize = ZSTD_blockHeaderSize+blockSize;
|
2016-02-02 13:36:49 +00:00
|
|
|
} else {
|
2016-07-27 22:55:43 +00:00
|
|
|
U32 const cBlockHeader24 = lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
|
2016-07-20 12:58:49 +00:00
|
|
|
MEM_writeLE24(op, cBlockHeader24);
|
2016-07-27 22:55:43 +00:00
|
|
|
cSize += ZSTD_blockHeaderSize;
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
|
|
|
|
2015-11-04 17:19:39 +00:00
|
|
|
remaining -= blockSize;
|
2016-03-15 00:24:33 +00:00
|
|
|
dstCapacity -= cSize;
|
2015-11-04 17:19:39 +00:00
|
|
|
ip += blockSize;
|
2015-10-22 14:31:46 +00:00
|
|
|
op += cSize;
|
|
|
|
}
|
|
|
|
|
2016-07-28 13:29:08 +00:00
|
|
|
if (lastFrameChunk && (op>ostart)) cctx->stage = ZSTDcs_ending;
|
2015-10-22 14:31:46 +00:00
|
|
|
return op-ostart;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-04-12 13:52:33 +00:00
|
|
|
static size_t ZSTD_writeFrameHeader(void* dst, size_t dstCapacity,
|
2016-05-29 03:01:04 +00:00
|
|
|
ZSTD_parameters params, U64 pledgedSrcSize, U32 dictID)
|
2016-04-12 13:52:33 +00:00
|
|
|
{ BYTE* const op = (BYTE*)dst;
|
2017-04-27 07:29:04 +00:00
|
|
|
U32 const dictIDSizeCodeLength = (dictID>0) + (dictID>=256) + (dictID>=65536); /* 0-3 */
|
|
|
|
U32 const dictIDSizeCode = params.fParams.noDictIDFlag ? 0 : dictIDSizeCodeLength; /* 0-3 */
|
2016-07-27 19:05:12 +00:00
|
|
|
U32 const checksumFlag = params.fParams.checksumFlag>0;
|
|
|
|
U32 const windowSize = 1U << params.cParams.windowLog;
|
2017-02-09 18:50:43 +00:00
|
|
|
U32 const singleSegment = params.fParams.contentSizeFlag && (windowSize >= pledgedSrcSize);
|
2016-07-27 19:05:12 +00:00
|
|
|
BYTE const windowLogByte = (BYTE)((params.cParams.windowLog - ZSTD_WINDOWLOG_ABSOLUTEMIN) << 3);
|
|
|
|
U32 const fcsCode = params.fParams.contentSizeFlag ?
|
2017-05-24 20:50:10 +00:00
|
|
|
(pledgedSrcSize>=256) + (pledgedSrcSize>=65536+256) + (pledgedSrcSize>=0xFFFFFFFFU) : 0; /* 0-3 */
|
2016-07-27 19:05:12 +00:00
|
|
|
BYTE const frameHeaderDecriptionByte = (BYTE)(dictIDSizeCode + (checksumFlag<<2) + (singleSegment<<5) + (fcsCode<<6) );
|
2016-05-29 03:01:04 +00:00
|
|
|
size_t pos;
|
|
|
|
|
|
|
|
if (dstCapacity < ZSTD_frameHeaderSize_max) return ERROR(dstSize_tooSmall);
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_writeFrameHeader : dictIDFlag : %u ; dictID : %u ; dictIDSizeCode : %u",
|
2017-05-08 23:08:01 +00:00
|
|
|
!params.fParams.noDictIDFlag, dictID, dictIDSizeCode);
|
2016-04-12 13:52:33 +00:00
|
|
|
|
|
|
|
MEM_writeLE32(dst, ZSTD_MAGICNUMBER);
|
2016-06-05 22:26:38 +00:00
|
|
|
op[4] = frameHeaderDecriptionByte; pos=5;
|
2016-07-26 17:42:19 +00:00
|
|
|
if (!singleSegment) op[pos++] = windowLogByte;
|
2016-05-29 03:01:04 +00:00
|
|
|
switch(dictIDSizeCode)
|
|
|
|
{
|
2017-06-01 16:44:54 +00:00
|
|
|
default: assert(0); /* impossible */
|
2016-05-29 03:01:04 +00:00
|
|
|
case 0 : break;
|
|
|
|
case 1 : op[pos] = (BYTE)(dictID); pos++; break;
|
2016-07-27 19:21:36 +00:00
|
|
|
case 2 : MEM_writeLE16(op+pos, (U16)dictID); pos+=2; break;
|
2016-05-29 03:01:04 +00:00
|
|
|
case 3 : MEM_writeLE32(op+pos, dictID); pos+=4; break;
|
|
|
|
}
|
2016-06-05 22:26:38 +00:00
|
|
|
switch(fcsCode)
|
2016-04-12 13:52:33 +00:00
|
|
|
{
|
2017-06-01 16:44:54 +00:00
|
|
|
default: assert(0); /* impossible */
|
2016-07-26 17:42:19 +00:00
|
|
|
case 0 : if (singleSegment) op[pos++] = (BYTE)(pledgedSrcSize); break;
|
2016-06-05 22:26:38 +00:00
|
|
|
case 1 : MEM_writeLE16(op+pos, (U16)(pledgedSrcSize-256)); pos+=2; break;
|
|
|
|
case 2 : MEM_writeLE32(op+pos, (U32)(pledgedSrcSize)); pos+=4; break;
|
2016-05-29 03:01:04 +00:00
|
|
|
case 3 : MEM_writeLE64(op+pos, (U64)(pledgedSrcSize)); pos+=8; break;
|
2016-04-12 13:52:33 +00:00
|
|
|
}
|
2016-05-29 03:01:04 +00:00
|
|
|
return pos;
|
2016-04-12 13:52:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-08-02 12:26:00 +00:00
|
|
|
static size_t ZSTD_compressContinue_internal (ZSTD_CCtx* cctx,
|
2016-03-23 21:31:57 +00:00
|
|
|
void* dst, size_t dstCapacity,
|
2016-01-09 00:08:23 +00:00
|
|
|
const void* src, size_t srcSize,
|
2016-07-27 22:55:43 +00:00
|
|
|
U32 frame, U32 lastFrameChunk)
|
2015-10-22 14:31:46 +00:00
|
|
|
{
|
2015-10-29 15:49:43 +00:00
|
|
|
const BYTE* const ip = (const BYTE*) src;
|
2016-04-12 13:52:33 +00:00
|
|
|
size_t fhSize = 0;
|
2016-01-07 14:35:18 +00:00
|
|
|
|
2016-08-02 12:26:00 +00:00
|
|
|
if (cctx->stage==ZSTDcs_created) return ERROR(stage_wrong); /* missing init (ZSTD_compressBegin) */
|
2016-07-27 19:21:36 +00:00
|
|
|
|
2016-08-02 12:26:00 +00:00
|
|
|
if (frame && (cctx->stage==ZSTDcs_init)) {
|
2017-05-23 00:06:04 +00:00
|
|
|
fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, cctx->appliedParams, cctx->frameContentSize, cctx->dictID);
|
2016-04-12 13:52:33 +00:00
|
|
|
if (ZSTD_isError(fhSize)) return fhSize;
|
|
|
|
dstCapacity -= fhSize;
|
|
|
|
dst = (char*)dst + fhSize;
|
2016-08-02 12:26:00 +00:00
|
|
|
cctx->stage = ZSTDcs_ongoing;
|
2016-01-07 14:35:18 +00:00
|
|
|
}
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2015-12-04 16:16:37 +00:00
|
|
|
/* Check if blocks follow each other */
|
2016-08-02 12:26:00 +00:00
|
|
|
if (src != cctx->nextSrc) {
|
2015-12-04 16:16:37 +00:00
|
|
|
/* not contiguous */
|
2016-08-02 12:26:00 +00:00
|
|
|
ptrdiff_t const delta = cctx->nextSrc - ip;
|
|
|
|
cctx->lowLimit = cctx->dictLimit;
|
|
|
|
cctx->dictLimit = (U32)(cctx->nextSrc - cctx->base);
|
|
|
|
cctx->dictBase = cctx->base;
|
|
|
|
cctx->base -= delta;
|
|
|
|
cctx->nextToUpdate = cctx->dictLimit;
|
|
|
|
if (cctx->dictLimit - cctx->lowLimit < HASH_READ_SIZE) cctx->lowLimit = cctx->dictLimit; /* too small extDict */
|
2015-12-04 16:16:37 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 12:26:00 +00:00
|
|
|
/* if input and dictionary overlap : reduce dictionary (area presumed modified by input) */
|
|
|
|
if ((ip+srcSize > cctx->dictBase + cctx->lowLimit) & (ip < cctx->dictBase + cctx->dictLimit)) {
|
|
|
|
ptrdiff_t const highInputIdx = (ip + srcSize) - cctx->dictBase;
|
|
|
|
U32 const lowLimitMax = (highInputIdx > (ptrdiff_t)cctx->dictLimit) ? cctx->dictLimit : (U32)highInputIdx;
|
|
|
|
cctx->lowLimit = lowLimitMax;
|
2015-11-13 10:27:46 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 12:26:00 +00:00
|
|
|
cctx->nextSrc = ip + srcSize;
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2017-01-11 17:21:25 +00:00
|
|
|
if (srcSize) {
|
|
|
|
size_t const cSize = frame ?
|
2017-05-12 20:46:49 +00:00
|
|
|
ZSTD_compress_frameChunk (cctx, dst, dstCapacity, src, srcSize, lastFrameChunk) :
|
2016-08-02 12:26:00 +00:00
|
|
|
ZSTD_compressBlock_internal (cctx, dst, dstCapacity, src, srcSize);
|
2016-01-07 14:35:18 +00:00
|
|
|
if (ZSTD_isError(cSize)) return cSize;
|
2017-04-12 01:34:02 +00:00
|
|
|
cctx->consumedSrcSize += srcSize;
|
2016-04-12 13:52:33 +00:00
|
|
|
return cSize + fhSize;
|
2017-01-11 17:21:25 +00:00
|
|
|
} else
|
|
|
|
return fhSize;
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
|
|
|
|
2016-01-09 00:08:23 +00:00
|
|
|
|
2016-07-27 23:17:22 +00:00
|
|
|
size_t ZSTD_compressContinue (ZSTD_CCtx* cctx,
|
2016-03-23 21:31:57 +00:00
|
|
|
void* dst, size_t dstCapacity,
|
2016-01-09 00:08:23 +00:00
|
|
|
const void* src, size_t srcSize)
|
|
|
|
{
|
2017-04-12 01:34:02 +00:00
|
|
|
return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 1 /* frame mode */, 0 /* last chunk */);
|
2016-07-27 23:17:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-05-19 17:51:30 +00:00
|
|
|
size_t ZSTD_getBlockSize(const ZSTD_CCtx* cctx)
|
2016-01-09 00:08:23 +00:00
|
|
|
{
|
2017-05-19 17:51:30 +00:00
|
|
|
U32 const cLevel = cctx->compressionLevel;
|
|
|
|
ZSTD_compressionParameters cParams = (cLevel == ZSTD_CLEVEL_CUSTOM) ?
|
2017-05-23 00:06:04 +00:00
|
|
|
cctx->appliedParams.cParams :
|
2017-05-19 17:51:30 +00:00
|
|
|
ZSTD_getCParams(cLevel, 0, 0);
|
|
|
|
return MIN (ZSTD_BLOCKSIZE_MAX, 1 << cParams.windowLog);
|
2016-07-18 14:52:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t ZSTD_compressBlock(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
|
|
|
{
|
2017-05-19 17:51:30 +00:00
|
|
|
size_t const blockSizeMax = ZSTD_getBlockSize(cctx);
|
2016-07-15 09:56:53 +00:00
|
|
|
if (srcSize > blockSizeMax) return ERROR(srcSize_wrong);
|
2017-04-12 01:34:02 +00:00
|
|
|
return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 0 /* frame mode */, 0 /* last chunk */);
|
2016-01-09 00:08:23 +00:00
|
|
|
}
|
|
|
|
|
2017-03-24 19:46:46 +00:00
|
|
|
/*! ZSTD_loadDictionaryContent() :
|
|
|
|
* @return : 0, or an error code
|
|
|
|
*/
|
2016-01-26 02:14:20 +00:00
|
|
|
static size_t ZSTD_loadDictionaryContent(ZSTD_CCtx* zc, const void* src, size_t srcSize)
|
2015-12-04 16:16:37 +00:00
|
|
|
{
|
|
|
|
const BYTE* const ip = (const BYTE*) src;
|
|
|
|
const BYTE* const iend = ip + srcSize;
|
|
|
|
|
|
|
|
/* input becomes current prefix */
|
|
|
|
zc->lowLimit = zc->dictLimit;
|
|
|
|
zc->dictLimit = (U32)(zc->nextSrc - zc->base);
|
|
|
|
zc->dictBase = zc->base;
|
|
|
|
zc->base += ip - zc->nextSrc;
|
|
|
|
zc->nextToUpdate = zc->dictLimit;
|
2017-01-26 00:39:03 +00:00
|
|
|
zc->loadedDictEnd = zc->forceWindow ? 0 : (U32)(iend - zc->base);
|
2015-12-04 16:16:37 +00:00
|
|
|
|
|
|
|
zc->nextSrc = iend;
|
2016-07-27 19:05:12 +00:00
|
|
|
if (srcSize <= HASH_READ_SIZE) return 0;
|
2015-12-04 16:16:37 +00:00
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
switch(zc->appliedParams.cParams.strategy)
|
2015-12-04 16:16:37 +00:00
|
|
|
{
|
|
|
|
case ZSTD_fast:
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_fillHashTable (zc, iend, zc->appliedParams.cParams.searchLength);
|
2015-12-04 16:16:37 +00:00
|
|
|
break;
|
|
|
|
|
2016-07-12 07:47:31 +00:00
|
|
|
case ZSTD_dfast:
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_fillDoubleHashTable (zc, iend, zc->appliedParams.cParams.searchLength);
|
2016-07-12 07:47:31 +00:00
|
|
|
break;
|
|
|
|
|
2015-12-04 16:16:37 +00:00
|
|
|
case ZSTD_greedy:
|
|
|
|
case ZSTD_lazy:
|
|
|
|
case ZSTD_lazy2:
|
2017-03-24 19:46:46 +00:00
|
|
|
if (srcSize >= HASH_READ_SIZE)
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_insertAndFindFirstIndex(zc, iend-HASH_READ_SIZE, zc->appliedParams.cParams.searchLength);
|
2015-12-04 16:16:37 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ZSTD_btlazy2:
|
2016-02-15 06:21:54 +00:00
|
|
|
case ZSTD_btopt:
|
2017-03-09 19:44:25 +00:00
|
|
|
case ZSTD_btultra:
|
2017-03-24 19:46:46 +00:00
|
|
|
if (srcSize >= HASH_READ_SIZE)
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_updateTree(zc, iend-HASH_READ_SIZE, iend, 1 << zc->appliedParams.cParams.searchLog, zc->appliedParams.cParams.searchLength);
|
2015-12-04 16:16:37 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2017-06-01 16:44:54 +00:00
|
|
|
assert(0); /* not possible : not a valid strategy id */
|
2015-12-04 16:16:37 +00:00
|
|
|
}
|
|
|
|
|
[zstdmt] Fix MSAN failure with ZSTD_p_forceWindow
Reproduction steps:
```
make zstreamtest CC=clang CFLAGS="-O3 -g -fsanitize=memory -fsanitize-memory-track-origins"
./zstreamtest -vv -t4178 -i4178 -s4531
```
How to get to the error in gdb (may be a more efficient way):
* 2 breaks at zstd_compress.c:2418 -- in ZSTD_compressContinue_internal()
* 2 breaks at zstd_compress.c:2276 -- in ZSTD_compressBlock_internal()
* 1 break at zstd_compress.c:1547
Why the error occurred:
When `zc->forceWindow == 1`, after calling `ZSTD_loadDictionaryContent()` we
have `zc->loadedDictEnd == zc->nextToUpdate == 0`. But, we've really loaded up
to `iend` into the dictionary. Then in `ZSTD_compressBlock_internal()` we see
that `current > zc->nextToUpdate + 384`, so we load the last 192 bytes a second
time. In this case the bytes we are loading are a block of all 0s, starting in
the previous block. So when we are loading the last 192 bytes, we find a `match`
in the future, 183 bytes beyond `ip`. Since the block is all 0s, the match
extends to the end of the block. But in `ZSTD_count()` we only check that
`pIn < pInLoopLimit`, but since `pMatch > pIn`, `pMatch` eventually points past
the end of the buffer, causing the MSAN failure.
The fix:
The line changed sets sets `zc->nextToUpdate` to the end of the dictionary.
This is the behavior that existed before `ZSTD_p_forceWindow` was introduced.
This fixes the exposing test case. Since the code doesn't fail without
`zc->forceWindow`, it makes sense that this works. I've run the command
`./zstreamtest -T2mn` 64 times without failures. CI should also verify nothing
obvious broke.
2017-02-14 02:27:34 +00:00
|
|
|
zc->nextToUpdate = (U32)(iend - zc->base);
|
2015-12-04 16:16:37 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-10-22 14:31:46 +00:00
|
|
|
|
2016-10-20 00:22:08 +00:00
|
|
|
/* Dictionaries that assign zero probability to symbols that show up causes problems
|
|
|
|
when FSE encoding. Refuse dictionaries that assign zero probability to symbols
|
|
|
|
that we may encounter during compression.
|
|
|
|
NOTE: This behavior is not standard and could be improved in the future. */
|
|
|
|
static size_t ZSTD_checkDictNCount(short* normalizedCounter, unsigned dictMaxSymbolValue, unsigned maxSymbolValue) {
|
|
|
|
U32 s;
|
|
|
|
if (dictMaxSymbolValue < maxSymbolValue) return ERROR(dictionary_corrupted);
|
|
|
|
for (s = 0; s <= maxSymbolValue; ++s) {
|
|
|
|
if (normalizedCounter[s] == 0) return ERROR(dictionary_corrupted);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-01-26 02:14:20 +00:00
|
|
|
/* Dictionary format :
|
2017-03-23 01:09:11 +00:00
|
|
|
* See :
|
|
|
|
* https://github.com/facebook/zstd/blob/master/doc/zstd_compression_format.md#dictionary-format
|
|
|
|
*/
|
2017-03-24 19:46:46 +00:00
|
|
|
/*! ZSTD_loadZstdDictionary() :
|
|
|
|
* @return : 0, or an error code
|
|
|
|
* assumptions : magic number supposed already checked
|
|
|
|
* dictSize supposed > 8
|
2017-03-23 01:09:11 +00:00
|
|
|
*/
|
2017-03-24 19:46:46 +00:00
|
|
|
static size_t ZSTD_loadZstdDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize)
|
2016-01-26 02:14:20 +00:00
|
|
|
{
|
2016-06-15 11:53:34 +00:00
|
|
|
const BYTE* dictPtr = (const BYTE*)dict;
|
|
|
|
const BYTE* const dictEnd = dictPtr + dictSize;
|
2016-10-20 00:22:08 +00:00
|
|
|
short offcodeNCount[MaxOff+1];
|
|
|
|
unsigned offcodeMaxValue = MaxOff;
|
2016-12-02 00:24:04 +00:00
|
|
|
BYTE scratchBuffer[1<<MAX(MLFSELog,LLFSELog)];
|
2016-05-31 16:13:56 +00:00
|
|
|
|
2017-03-23 01:09:11 +00:00
|
|
|
dictPtr += 4; /* skip magic number */
|
2017-05-23 00:06:04 +00:00
|
|
|
cctx->dictID = cctx->appliedParams.fParams.noDictIDFlag ? 0 : MEM_readLE32(dictPtr);
|
2017-03-23 01:09:11 +00:00
|
|
|
dictPtr += 4;
|
|
|
|
|
2017-04-21 05:54:54 +00:00
|
|
|
{ size_t const hufHeaderSize = HUF_readCTable(cctx->hufCTable, 255, dictPtr, dictEnd-dictPtr);
|
2016-05-31 16:13:56 +00:00
|
|
|
if (HUF_isError(hufHeaderSize)) return ERROR(dictionary_corrupted);
|
2016-06-15 11:53:34 +00:00
|
|
|
dictPtr += hufHeaderSize;
|
2016-05-31 16:13:56 +00:00
|
|
|
}
|
|
|
|
|
2016-10-20 00:22:08 +00:00
|
|
|
{ unsigned offcodeLog;
|
2016-06-15 11:53:34 +00:00
|
|
|
size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, dictEnd-dictPtr);
|
2016-05-31 16:13:56 +00:00
|
|
|
if (FSE_isError(offcodeHeaderSize)) return ERROR(dictionary_corrupted);
|
Fix buffer overrun in ZSTD_loadDictEntropyStats()
The table log set by `FSE_readNCount()` was not checked in
`ZSTD_loadDictEntropyStats()`. This caused `FSE_buildCTable()`
to stack/heap overflow in a few places.
The benchmarks look good, there is no obvious compression performance regression:
> ./zstds/zstd.opt.0 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 271.6 MB/s , 716.8 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 204.8 MB/s , 671.1 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 156.8 MB/s , 658.6 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 136.4 MB/s , 665.3 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 98.9 MB/s , 647.0 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 65.2 MB/s , 670.4 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.9 MB/s , 688.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 32.4 MB/s , 711.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.1 MB/s , 718.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 22.2 MB/s , 721.8 MB/s
> ./compress_zstds/zstd.opt.1 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 273.8 MB/s , 722.0 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 203.2 MB/s , 666.6 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 157.4 MB/s , 666.5 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 132.1 MB/s , 661.9 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 96.8 MB/s , 641.6 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 63.1 MB/s , 677.0 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.3 MB/s , 678.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 33.1 MB/s , 708.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.5 MB/s , 710.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 21.9 MB/s , 723.9 MB/s
2016-10-17 23:55:52 +00:00
|
|
|
if (offcodeLog > OffFSELog) return ERROR(dictionary_corrupted);
|
2016-10-20 00:22:08 +00:00
|
|
|
/* Defer checking offcodeMaxValue because we need to know the size of the dictionary content */
|
2017-04-20 19:50:02 +00:00
|
|
|
CHECK_E( FSE_buildCTable_wksp(cctx->offcodeCTable, offcodeNCount, offcodeMaxValue, offcodeLog, scratchBuffer, sizeof(scratchBuffer)),
|
|
|
|
dictionary_corrupted);
|
2016-06-15 11:53:34 +00:00
|
|
|
dictPtr += offcodeHeaderSize;
|
2016-05-31 16:13:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{ short matchlengthNCount[MaxML+1];
|
Fix buffer overrun in ZSTD_loadDictEntropyStats()
The table log set by `FSE_readNCount()` was not checked in
`ZSTD_loadDictEntropyStats()`. This caused `FSE_buildCTable()`
to stack/heap overflow in a few places.
The benchmarks look good, there is no obvious compression performance regression:
> ./zstds/zstd.opt.0 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 271.6 MB/s , 716.8 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 204.8 MB/s , 671.1 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 156.8 MB/s , 658.6 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 136.4 MB/s , 665.3 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 98.9 MB/s , 647.0 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 65.2 MB/s , 670.4 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.9 MB/s , 688.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 32.4 MB/s , 711.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.1 MB/s , 718.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 22.2 MB/s , 721.8 MB/s
> ./compress_zstds/zstd.opt.1 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 273.8 MB/s , 722.0 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 203.2 MB/s , 666.6 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 157.4 MB/s , 666.5 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 132.1 MB/s , 661.9 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 96.8 MB/s , 641.6 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 63.1 MB/s , 677.0 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.3 MB/s , 678.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 33.1 MB/s , 708.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.5 MB/s , 710.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 21.9 MB/s , 723.9 MB/s
2016-10-17 23:55:52 +00:00
|
|
|
unsigned matchlengthMaxValue = MaxML, matchlengthLog;
|
2016-06-15 11:53:34 +00:00
|
|
|
size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, dictEnd-dictPtr);
|
2016-05-31 16:13:56 +00:00
|
|
|
if (FSE_isError(matchlengthHeaderSize)) return ERROR(dictionary_corrupted);
|
Fix buffer overrun in ZSTD_loadDictEntropyStats()
The table log set by `FSE_readNCount()` was not checked in
`ZSTD_loadDictEntropyStats()`. This caused `FSE_buildCTable()`
to stack/heap overflow in a few places.
The benchmarks look good, there is no obvious compression performance regression:
> ./zstds/zstd.opt.0 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 271.6 MB/s , 716.8 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 204.8 MB/s , 671.1 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 156.8 MB/s , 658.6 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 136.4 MB/s , 665.3 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 98.9 MB/s , 647.0 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 65.2 MB/s , 670.4 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.9 MB/s , 688.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 32.4 MB/s , 711.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.1 MB/s , 718.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 22.2 MB/s , 721.8 MB/s
> ./compress_zstds/zstd.opt.1 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 273.8 MB/s , 722.0 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 203.2 MB/s , 666.6 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 157.4 MB/s , 666.5 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 132.1 MB/s , 661.9 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 96.8 MB/s , 641.6 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 63.1 MB/s , 677.0 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.3 MB/s , 678.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 33.1 MB/s , 708.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.5 MB/s , 710.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 21.9 MB/s , 723.9 MB/s
2016-10-17 23:55:52 +00:00
|
|
|
if (matchlengthLog > MLFSELog) return ERROR(dictionary_corrupted);
|
2016-10-20 00:22:08 +00:00
|
|
|
/* Every match length code must have non-zero probability */
|
2017-04-20 19:50:02 +00:00
|
|
|
CHECK_F( ZSTD_checkDictNCount(matchlengthNCount, matchlengthMaxValue, MaxML));
|
|
|
|
CHECK_E( FSE_buildCTable_wksp(cctx->matchlengthCTable, matchlengthNCount, matchlengthMaxValue, matchlengthLog, scratchBuffer, sizeof(scratchBuffer)),
|
|
|
|
dictionary_corrupted);
|
2016-06-15 11:53:34 +00:00
|
|
|
dictPtr += matchlengthHeaderSize;
|
2016-05-31 16:13:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{ short litlengthNCount[MaxLL+1];
|
Fix buffer overrun in ZSTD_loadDictEntropyStats()
The table log set by `FSE_readNCount()` was not checked in
`ZSTD_loadDictEntropyStats()`. This caused `FSE_buildCTable()`
to stack/heap overflow in a few places.
The benchmarks look good, there is no obvious compression performance regression:
> ./zstds/zstd.opt.0 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 271.6 MB/s , 716.8 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 204.8 MB/s , 671.1 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 156.8 MB/s , 658.6 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 136.4 MB/s , 665.3 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 98.9 MB/s , 647.0 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 65.2 MB/s , 670.4 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.9 MB/s , 688.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 32.4 MB/s , 711.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.1 MB/s , 718.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 22.2 MB/s , 721.8 MB/s
> ./compress_zstds/zstd.opt.1 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 273.8 MB/s , 722.0 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 203.2 MB/s , 666.6 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 157.4 MB/s , 666.5 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 132.1 MB/s , 661.9 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 96.8 MB/s , 641.6 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 63.1 MB/s , 677.0 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.3 MB/s , 678.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 33.1 MB/s , 708.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.5 MB/s , 710.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 21.9 MB/s , 723.9 MB/s
2016-10-17 23:55:52 +00:00
|
|
|
unsigned litlengthMaxValue = MaxLL, litlengthLog;
|
2016-06-15 11:53:34 +00:00
|
|
|
size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, dictEnd-dictPtr);
|
2016-05-31 16:13:56 +00:00
|
|
|
if (FSE_isError(litlengthHeaderSize)) return ERROR(dictionary_corrupted);
|
Fix buffer overrun in ZSTD_loadDictEntropyStats()
The table log set by `FSE_readNCount()` was not checked in
`ZSTD_loadDictEntropyStats()`. This caused `FSE_buildCTable()`
to stack/heap overflow in a few places.
The benchmarks look good, there is no obvious compression performance regression:
> ./zstds/zstd.opt.0 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 271.6 MB/s , 716.8 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 204.8 MB/s , 671.1 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 156.8 MB/s , 658.6 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 136.4 MB/s , 665.3 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 98.9 MB/s , 647.0 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 65.2 MB/s , 670.4 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.9 MB/s , 688.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 32.4 MB/s , 711.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.1 MB/s , 718.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 22.2 MB/s , 721.8 MB/s
> ./compress_zstds/zstd.opt.1 -i10 -b1 -e10 ~/bench/silesia.tar
1#silesia.tar : 211988480 -> 73656930 (2.878), 273.8 MB/s , 722.0 MB/s
2#silesia.tar : 211988480 -> 70162842 (3.021), 203.2 MB/s , 666.6 MB/s
3#silesia.tar : 211988480 -> 66997986 (3.164), 157.4 MB/s , 666.5 MB/s
4#silesia.tar : 211988480 -> 66002591 (3.212), 132.1 MB/s , 661.9 MB/s
5#silesia.tar : 211988480 -> 65008480 (3.261), 96.8 MB/s , 641.6 MB/s
6#silesia.tar : 211988480 -> 62979643 (3.366), 63.1 MB/s , 677.0 MB/s
7#silesia.tar : 211988480 -> 61974560 (3.421), 44.3 MB/s , 678.2 MB/s
8#silesia.tar : 211988480 -> 61028308 (3.474), 33.1 MB/s , 708.9 MB/s
9#silesia.tar : 211988480 -> 60416751 (3.509), 21.5 MB/s , 710.1 MB/s
10#silesia.tar : 211988480 -> 60174239 (3.523), 21.9 MB/s , 723.9 MB/s
2016-10-17 23:55:52 +00:00
|
|
|
if (litlengthLog > LLFSELog) return ERROR(dictionary_corrupted);
|
2016-10-20 00:22:08 +00:00
|
|
|
/* Every literal length code must have non-zero probability */
|
2017-04-20 19:50:02 +00:00
|
|
|
CHECK_F( ZSTD_checkDictNCount(litlengthNCount, litlengthMaxValue, MaxLL));
|
|
|
|
CHECK_E( FSE_buildCTable_wksp(cctx->litlengthCTable, litlengthNCount, litlengthMaxValue, litlengthLog, scratchBuffer, sizeof(scratchBuffer)),
|
|
|
|
dictionary_corrupted);
|
2016-06-15 11:53:34 +00:00
|
|
|
dictPtr += litlengthHeaderSize;
|
2016-05-31 16:13:56 +00:00
|
|
|
}
|
|
|
|
|
2016-06-15 11:53:34 +00:00
|
|
|
if (dictPtr+12 > dictEnd) return ERROR(dictionary_corrupted);
|
2017-03-24 19:46:46 +00:00
|
|
|
cctx->rep[0] = MEM_readLE32(dictPtr+0);
|
|
|
|
cctx->rep[1] = MEM_readLE32(dictPtr+4);
|
|
|
|
cctx->rep[2] = MEM_readLE32(dictPtr+8);
|
2016-06-15 11:53:34 +00:00
|
|
|
dictPtr += 12;
|
|
|
|
|
2017-03-23 01:09:11 +00:00
|
|
|
{ size_t const dictContentSize = (size_t)(dictEnd - dictPtr);
|
|
|
|
U32 offcodeMax = MaxOff;
|
|
|
|
if (dictContentSize <= ((U32)-1) - 128 KB) {
|
|
|
|
U32 const maxOffset = (U32)dictContentSize + 128 KB; /* The maximum offset that must be supported */
|
|
|
|
offcodeMax = ZSTD_highbit32(maxOffset); /* Calculate minimum offset code required to represent maxOffset */
|
2016-10-24 21:11:27 +00:00
|
|
|
}
|
2017-03-23 01:09:11 +00:00
|
|
|
/* All offset values <= dictContentSize + 128 KB must be representable */
|
2016-10-20 00:22:08 +00:00
|
|
|
CHECK_F (ZSTD_checkDictNCount(offcodeNCount, offcodeMaxValue, MIN(offcodeMax, MaxOff)));
|
2017-03-23 01:09:11 +00:00
|
|
|
/* All repCodes must be <= dictContentSize and != 0*/
|
|
|
|
{ U32 u;
|
|
|
|
for (u=0; u<3; u++) {
|
|
|
|
if (cctx->rep[u] == 0) return ERROR(dictionary_corrupted);
|
|
|
|
if (cctx->rep[u] > dictContentSize) return ERROR(dictionary_corrupted);
|
2017-03-24 19:46:46 +00:00
|
|
|
} }
|
2016-10-20 00:22:08 +00:00
|
|
|
|
2017-04-21 05:54:54 +00:00
|
|
|
cctx->fseCTables_ready = 1;
|
|
|
|
cctx->hufCTable_repeatMode = HUF_repeat_valid;
|
2017-03-24 19:46:46 +00:00
|
|
|
return ZSTD_loadDictionaryContent(cctx, dictPtr, dictContentSize);
|
|
|
|
}
|
2016-01-26 02:14:20 +00:00
|
|
|
}
|
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
/** ZSTD_compress_insertDictionary() :
|
|
|
|
* @return : 0, or an error code */
|
2017-03-24 19:46:46 +00:00
|
|
|
static size_t ZSTD_compress_insertDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize)
|
2016-01-26 02:14:20 +00:00
|
|
|
{
|
2016-05-29 03:01:04 +00:00
|
|
|
if ((dict==NULL) || (dictSize<=8)) return 0;
|
2016-01-26 14:58:49 +00:00
|
|
|
|
2017-02-24 07:42:12 +00:00
|
|
|
/* dict as pure content */
|
2017-03-24 19:46:46 +00:00
|
|
|
if ((MEM_readLE32(dict) != ZSTD_DICT_MAGIC) || (cctx->forceRawDict))
|
|
|
|
return ZSTD_loadDictionaryContent(cctx, dict, dictSize);
|
2016-03-15 00:24:33 +00:00
|
|
|
|
2017-03-23 01:09:11 +00:00
|
|
|
/* dict as zstd dictionary */
|
2017-03-24 19:46:46 +00:00
|
|
|
return ZSTD_loadZstdDictionary(cctx, dict, dictSize);
|
2016-01-07 14:35:18 +00:00
|
|
|
}
|
|
|
|
|
2016-04-01 13:48:48 +00:00
|
|
|
/*! ZSTD_compressBegin_internal() :
|
2016-01-07 14:35:18 +00:00
|
|
|
* @return : 0, or an error code */
|
2016-09-06 07:44:59 +00:00
|
|
|
static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
|
2016-01-26 15:31:22 +00:00
|
|
|
const void* dict, size_t dictSize,
|
2017-05-23 01:21:51 +00:00
|
|
|
const ZSTD_CDict* cdict,
|
2017-05-23 18:18:24 +00:00
|
|
|
ZSTD_parameters params, U64 pledgedSrcSize,
|
|
|
|
ZSTD_buffered_policy_e zbuff)
|
2015-10-22 14:31:46 +00:00
|
|
|
{
|
2017-05-23 18:18:24 +00:00
|
|
|
/* params are supposed to be fully validated at this point */
|
2017-04-11 17:46:20 +00:00
|
|
|
assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
|
2017-05-23 01:21:51 +00:00
|
|
|
assert(!((dict) && (cdict))); /* either dict or cdict, not both */
|
|
|
|
|
|
|
|
if (cdict && cdict->dictContentSize>0)
|
2017-05-23 18:18:24 +00:00
|
|
|
return ZSTD_copyCCtx_internal(cctx, cdict->refContext,
|
|
|
|
params.fParams, pledgedSrcSize);
|
2017-05-23 01:21:51 +00:00
|
|
|
|
2017-05-23 18:18:24 +00:00
|
|
|
CHECK_F(ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize,
|
|
|
|
ZSTDcrp_continue, zbuff));
|
2016-09-06 07:44:59 +00:00
|
|
|
return ZSTD_compress_insertDictionary(cctx, dict, dictSize);
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
|
|
|
|
2015-10-25 13:06:35 +00:00
|
|
|
|
2016-04-01 13:48:48 +00:00
|
|
|
/*! ZSTD_compressBegin_advanced() :
|
|
|
|
* @return : 0, or an error code */
|
2016-06-06 22:51:51 +00:00
|
|
|
size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx,
|
2016-04-01 13:48:48 +00:00
|
|
|
const void* dict, size_t dictSize,
|
2016-07-07 09:53:18 +00:00
|
|
|
ZSTD_parameters params, unsigned long long pledgedSrcSize)
|
2016-04-01 13:48:48 +00:00
|
|
|
{
|
|
|
|
/* compression parameters verification and optimization */
|
2016-09-26 14:41:05 +00:00
|
|
|
CHECK_F(ZSTD_checkCParams(params.cParams));
|
2017-05-23 18:18:24 +00:00
|
|
|
return ZSTD_compressBegin_internal(cctx, dict, dictSize, NULL,
|
|
|
|
params, pledgedSrcSize, ZSTDb_not_buffered);
|
2016-04-01 13:48:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-06-06 22:51:51 +00:00
|
|
|
size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel)
|
2016-01-26 02:14:20 +00:00
|
|
|
{
|
2016-06-27 13:28:45 +00:00
|
|
|
ZSTD_parameters const params = ZSTD_getParams(compressionLevel, 0, dictSize);
|
2017-05-23 18:18:24 +00:00
|
|
|
return ZSTD_compressBegin_internal(cctx, dict, dictSize, NULL,
|
|
|
|
params, 0, ZSTDb_not_buffered);
|
2016-01-26 15:31:22 +00:00
|
|
|
}
|
2015-11-25 13:42:45 +00:00
|
|
|
|
2016-04-04 10:10:00 +00:00
|
|
|
|
2017-01-12 01:01:28 +00:00
|
|
|
size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel)
|
2015-11-25 13:42:45 +00:00
|
|
|
{
|
2017-01-12 01:01:28 +00:00
|
|
|
return ZSTD_compressBegin_usingDict(cctx, NULL, 0, compressionLevel);
|
2015-10-25 13:06:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-28 13:29:08 +00:00
|
|
|
/*! ZSTD_writeEpilogue() :
|
|
|
|
* Ends a frame.
|
2015-11-25 13:42:45 +00:00
|
|
|
* @return : nb of bytes written into dst (or an error code) */
|
2016-07-28 13:29:08 +00:00
|
|
|
static size_t ZSTD_writeEpilogue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity)
|
2015-10-29 15:49:43 +00:00
|
|
|
{
|
2016-07-27 22:55:43 +00:00
|
|
|
BYTE* const ostart = (BYTE*)dst;
|
|
|
|
BYTE* op = ostart;
|
2016-04-12 13:52:33 +00:00
|
|
|
size_t fhSize = 0;
|
2015-10-29 15:49:43 +00:00
|
|
|
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_writeEpilogue");
|
2016-08-25 23:43:47 +00:00
|
|
|
if (cctx->stage == ZSTDcs_created) return ERROR(stage_wrong); /* init missing */
|
2016-04-11 18:12:27 +00:00
|
|
|
|
|
|
|
/* special case : empty frame */
|
2016-07-27 22:55:43 +00:00
|
|
|
if (cctx->stage == ZSTDcs_init) {
|
2017-05-23 00:06:04 +00:00
|
|
|
fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, cctx->appliedParams, 0, 0);
|
2016-04-12 13:52:33 +00:00
|
|
|
if (ZSTD_isError(fhSize)) return fhSize;
|
|
|
|
dstCapacity -= fhSize;
|
|
|
|
op += fhSize;
|
2016-07-27 19:05:12 +00:00
|
|
|
cctx->stage = ZSTDcs_ongoing;
|
2016-01-07 14:35:18 +00:00
|
|
|
}
|
2015-10-29 15:49:43 +00:00
|
|
|
|
2016-07-27 22:55:43 +00:00
|
|
|
if (cctx->stage != ZSTDcs_ending) {
|
|
|
|
/* write one last empty block, make it the "last" block */
|
|
|
|
U32 const cBlockHeader24 = 1 /* last block */ + (((U32)bt_raw)<<1) + 0;
|
|
|
|
if (dstCapacity<4) return ERROR(dstSize_tooSmall);
|
|
|
|
MEM_writeLE32(op, cBlockHeader24);
|
|
|
|
op += ZSTD_blockHeaderSize;
|
|
|
|
dstCapacity -= ZSTD_blockHeaderSize;
|
|
|
|
}
|
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
if (cctx->appliedParams.fParams.checksumFlag) {
|
2016-07-27 22:55:43 +00:00
|
|
|
U32 const checksum = (U32) XXH64_digest(&cctx->xxhState);
|
|
|
|
if (dstCapacity<4) return ERROR(dstSize_tooSmall);
|
|
|
|
MEM_writeLE32(op, checksum);
|
|
|
|
op += 4;
|
2016-05-31 16:13:56 +00:00
|
|
|
}
|
2015-10-29 15:49:43 +00:00
|
|
|
|
2016-07-27 19:05:12 +00:00
|
|
|
cctx->stage = ZSTDcs_created; /* return to "created but no init" status */
|
2016-07-27 22:55:43 +00:00
|
|
|
return op-ostart;
|
2015-10-29 15:49:43 +00:00
|
|
|
}
|
|
|
|
|
2016-01-30 02:14:15 +00:00
|
|
|
|
2016-07-28 13:29:08 +00:00
|
|
|
size_t ZSTD_compressEnd (ZSTD_CCtx* cctx,
|
|
|
|
void* dst, size_t dstCapacity,
|
|
|
|
const void* src, size_t srcSize)
|
|
|
|
{
|
|
|
|
size_t endResult;
|
2017-05-19 17:17:59 +00:00
|
|
|
size_t const cSize = ZSTD_compressContinue_internal(cctx,
|
|
|
|
dst, dstCapacity, src, srcSize,
|
|
|
|
1 /* frame mode */, 1 /* last chunk */);
|
2016-07-28 13:29:08 +00:00
|
|
|
if (ZSTD_isError(cSize)) return cSize;
|
|
|
|
endResult = ZSTD_writeEpilogue(cctx, (char*)dst + cSize, dstCapacity-cSize);
|
|
|
|
if (ZSTD_isError(endResult)) return endResult;
|
2017-05-23 00:06:04 +00:00
|
|
|
if (cctx->appliedParams.fParams.contentSizeFlag) { /* control src size */
|
2017-05-08 23:08:01 +00:00
|
|
|
if (cctx->frameContentSize != cctx->consumedSrcSize)
|
|
|
|
return ERROR(srcSize_wrong);
|
2017-04-12 01:34:02 +00:00
|
|
|
}
|
2016-07-28 13:29:08 +00:00
|
|
|
return cSize + endResult;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-27 23:25:46 +00:00
|
|
|
static size_t ZSTD_compress_internal (ZSTD_CCtx* cctx,
|
2016-03-15 00:24:33 +00:00
|
|
|
void* dst, size_t dstCapacity,
|
2015-11-25 13:42:45 +00:00
|
|
|
const void* src, size_t srcSize,
|
2015-12-18 00:26:48 +00:00
|
|
|
const void* dict,size_t dictSize,
|
2015-11-25 13:42:45 +00:00
|
|
|
ZSTD_parameters params)
|
2015-10-22 14:31:46 +00:00
|
|
|
{
|
2017-05-23 18:18:24 +00:00
|
|
|
CHECK_F(ZSTD_compressBegin_internal(cctx, dict, dictSize, NULL,
|
|
|
|
params, srcSize, ZSTDb_not_buffered));
|
2016-07-28 13:29:08 +00:00
|
|
|
return ZSTD_compressEnd(cctx, dst, dstCapacity, src, srcSize);
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
|
|
|
|
2016-03-30 14:50:44 +00:00
|
|
|
size_t ZSTD_compress_advanced (ZSTD_CCtx* ctx,
|
|
|
|
void* dst, size_t dstCapacity,
|
|
|
|
const void* src, size_t srcSize,
|
|
|
|
const void* dict,size_t dictSize,
|
|
|
|
ZSTD_parameters params)
|
|
|
|
{
|
2016-09-26 14:41:05 +00:00
|
|
|
CHECK_F(ZSTD_checkCParams(params.cParams));
|
2016-03-30 14:50:44 +00:00
|
|
|
return ZSTD_compress_internal(ctx, dst, dstCapacity, src, srcSize, dict, dictSize, params);
|
|
|
|
}
|
|
|
|
|
2017-04-20 19:50:02 +00:00
|
|
|
size_t ZSTD_compress_usingDict(ZSTD_CCtx* ctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize,
|
|
|
|
const void* dict, size_t dictSize, int compressionLevel)
|
2015-12-18 00:26:48 +00:00
|
|
|
{
|
2016-11-03 22:52:01 +00:00
|
|
|
ZSTD_parameters params = ZSTD_getParams(compressionLevel, srcSize, dict ? dictSize : 0);
|
2016-03-30 17:48:05 +00:00
|
|
|
params.fParams.contentSizeFlag = 1;
|
2016-03-30 14:50:44 +00:00
|
|
|
return ZSTD_compress_internal(ctx, dst, dstCapacity, src, srcSize, dict, dictSize, params);
|
2015-12-18 00:26:48 +00:00
|
|
|
}
|
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
size_t ZSTD_compressCCtx (ZSTD_CCtx* ctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize, int compressionLevel)
|
2015-10-25 13:06:35 +00:00
|
|
|
{
|
2016-03-30 14:50:44 +00:00
|
|
|
return ZSTD_compress_usingDict(ctx, dst, dstCapacity, src, srcSize, NULL, 0, compressionLevel);
|
2015-10-25 13:06:35 +00:00
|
|
|
}
|
|
|
|
|
2016-03-15 00:24:33 +00:00
|
|
|
size_t ZSTD_compress(void* dst, size_t dstCapacity, const void* src, size_t srcSize, int compressionLevel)
|
2015-10-22 14:31:46 +00:00
|
|
|
{
|
2015-10-29 21:02:40 +00:00
|
|
|
size_t result;
|
2015-11-11 12:43:58 +00:00
|
|
|
ZSTD_CCtx ctxBody;
|
2015-10-29 17:41:45 +00:00
|
|
|
memset(&ctxBody, 0, sizeof(ctxBody));
|
2017-05-31 00:11:39 +00:00
|
|
|
ctxBody.customMem = ZSTD_defaultCMem;
|
2016-03-15 00:24:33 +00:00
|
|
|
result = ZSTD_compressCCtx(&ctxBody, dst, dstCapacity, src, srcSize, compressionLevel);
|
2017-05-31 00:11:39 +00:00
|
|
|
ZSTD_free(ctxBody.workSpace, ZSTD_defaultCMem); /* can't free ctxBody itself, as it's on stack; free only heap content */
|
2015-10-29 21:02:40 +00:00
|
|
|
return result;
|
2015-10-22 14:31:46 +00:00
|
|
|
}
|
2015-12-17 22:50:15 +00:00
|
|
|
|
2016-01-30 02:14:15 +00:00
|
|
|
|
2016-06-06 22:51:51 +00:00
|
|
|
/* ===== Dictionary API ===== */
|
|
|
|
|
2017-05-09 00:51:49 +00:00
|
|
|
/*! ZSTD_estimateCDictSize() :
|
|
|
|
* Estimate amount of memory that will be needed to create a dictionary with following arguments */
|
2017-05-25 22:07:37 +00:00
|
|
|
size_t ZSTD_estimateCDictSize(ZSTD_compressionParameters cParams, size_t dictSize, unsigned byReference)
|
2017-05-09 00:51:49 +00:00
|
|
|
{
|
2017-05-25 22:07:37 +00:00
|
|
|
return sizeof(ZSTD_CDict) + ZSTD_estimateCCtxSize(cParams)
|
|
|
|
+ (byReference ? 0 : dictSize);
|
2017-05-09 00:51:49 +00:00
|
|
|
}
|
|
|
|
|
2016-09-15 00:50:27 +00:00
|
|
|
size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict)
|
|
|
|
{
|
|
|
|
if (cdict==NULL) return 0; /* support sizeof on NULL */
|
2016-12-23 21:25:03 +00:00
|
|
|
return ZSTD_sizeof_CCtx(cdict->refContext) + (cdict->dictBuffer ? cdict->dictContentSize : 0) + sizeof(*cdict);
|
2016-09-15 00:50:27 +00:00
|
|
|
}
|
|
|
|
|
2017-04-27 19:57:11 +00:00
|
|
|
static ZSTD_parameters ZSTD_makeParams(ZSTD_compressionParameters cParams, ZSTD_frameParameters fParams)
|
|
|
|
{
|
|
|
|
ZSTD_parameters params;
|
|
|
|
params.cParams = cParams;
|
|
|
|
params.fParams = fParams;
|
|
|
|
return params;
|
|
|
|
}
|
|
|
|
|
2017-05-26 01:05:49 +00:00
|
|
|
static size_t ZSTD_initCDict_internal(
|
|
|
|
ZSTD_CDict* cdict,
|
|
|
|
const void* dictBuffer, size_t dictSize, unsigned byReference,
|
|
|
|
ZSTD_compressionParameters cParams)
|
|
|
|
{
|
|
|
|
if ((byReference) || (!dictBuffer) || (!dictSize)) {
|
|
|
|
cdict->dictBuffer = NULL;
|
|
|
|
cdict->dictContent = dictBuffer;
|
|
|
|
} else {
|
|
|
|
void* const internalBuffer = ZSTD_malloc(dictSize, cdict->refContext->customMem);
|
|
|
|
if (!internalBuffer) return ERROR(memory_allocation);
|
|
|
|
memcpy(internalBuffer, dictBuffer, dictSize);
|
|
|
|
cdict->dictBuffer = internalBuffer;
|
|
|
|
cdict->dictContent = internalBuffer;
|
|
|
|
}
|
|
|
|
cdict->dictContentSize = dictSize;
|
|
|
|
|
|
|
|
{ ZSTD_frameParameters const fParams = { 0 /* contentSizeFlag */,
|
|
|
|
0 /* checksumFlag */, 0 /* noDictIDFlag */ }; /* dummy */
|
|
|
|
ZSTD_parameters const params = ZSTD_makeParams(cParams, fParams);
|
|
|
|
CHECK_F( ZSTD_compressBegin_advanced(cdict->refContext,
|
|
|
|
cdict->dictContent, dictSize,
|
|
|
|
params, 0 /* srcSize */) );
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-12-21 15:20:11 +00:00
|
|
|
ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, unsigned byReference,
|
2017-04-27 07:29:04 +00:00
|
|
|
ZSTD_compressionParameters cParams, ZSTD_customMem customMem)
|
2016-06-06 22:51:51 +00:00
|
|
|
{
|
2017-05-20 02:46:15 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_createCDict_advanced");
|
2017-05-31 00:11:39 +00:00
|
|
|
if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
|
2016-06-06 22:51:51 +00:00
|
|
|
|
2016-08-29 04:05:43 +00:00
|
|
|
{ ZSTD_CDict* const cdict = (ZSTD_CDict*) ZSTD_malloc(sizeof(ZSTD_CDict), customMem);
|
2016-06-06 22:51:51 +00:00
|
|
|
ZSTD_CCtx* const cctx = ZSTD_createCCtx_advanced(customMem);
|
|
|
|
|
2016-12-21 15:20:11 +00:00
|
|
|
if (!cdict || !cctx) {
|
2016-08-29 04:05:43 +00:00
|
|
|
ZSTD_free(cdict, customMem);
|
2017-02-21 17:59:56 +00:00
|
|
|
ZSTD_freeCCtx(cctx);
|
2016-06-06 22:51:51 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2017-05-26 01:05:49 +00:00
|
|
|
cdict->refContext = cctx;
|
2016-06-06 22:51:51 +00:00
|
|
|
|
2017-05-26 01:05:49 +00:00
|
|
|
if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
|
|
|
|
dictBuffer, dictSize, byReference,
|
|
|
|
cParams) )) {
|
|
|
|
ZSTD_freeCDict(cdict);
|
|
|
|
return NULL;
|
2016-10-13 03:54:42 +00:00
|
|
|
}
|
2016-12-21 15:20:11 +00:00
|
|
|
|
2016-06-06 22:51:51 +00:00
|
|
|
return cdict;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ZSTD_CDict* ZSTD_createCDict(const void* dict, size_t dictSize, int compressionLevel)
|
|
|
|
{
|
|
|
|
ZSTD_customMem const allocator = { NULL, NULL, NULL };
|
2017-04-27 07:29:04 +00:00
|
|
|
ZSTD_compressionParameters cParams = ZSTD_getCParams(compressionLevel, 0, dictSize);
|
|
|
|
return ZSTD_createCDict_advanced(dict, dictSize, 0, cParams, allocator);
|
2016-12-21 15:20:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ZSTD_CDict* ZSTD_createCDict_byReference(const void* dict, size_t dictSize, int compressionLevel)
|
|
|
|
{
|
|
|
|
ZSTD_customMem const allocator = { NULL, NULL, NULL };
|
2017-04-27 07:29:04 +00:00
|
|
|
ZSTD_compressionParameters cParams = ZSTD_getCParams(compressionLevel, 0, dictSize);
|
|
|
|
return ZSTD_createCDict_advanced(dict, dictSize, 1, cParams, allocator);
|
2016-06-06 22:51:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t ZSTD_freeCDict(ZSTD_CDict* cdict)
|
|
|
|
{
|
2016-08-29 04:05:43 +00:00
|
|
|
if (cdict==NULL) return 0; /* support free on NULL */
|
2016-09-21 14:46:08 +00:00
|
|
|
{ ZSTD_customMem const cMem = cdict->refContext->customMem;
|
2016-08-29 04:05:43 +00:00
|
|
|
ZSTD_freeCCtx(cdict->refContext);
|
2016-12-21 15:44:35 +00:00
|
|
|
ZSTD_free(cdict->dictBuffer, cMem);
|
2016-08-29 04:05:43 +00:00
|
|
|
ZSTD_free(cdict, cMem);
|
|
|
|
return 0;
|
|
|
|
}
|
2016-06-06 22:51:51 +00:00
|
|
|
}
|
|
|
|
|
2017-05-26 01:05:49 +00:00
|
|
|
/*! ZSTD_initStaticCDict_advanced() :
|
|
|
|
* Generate a digested dictionary in provided memory area.
|
|
|
|
* workspace: The memory area to emplace the dictionary into.
|
|
|
|
* Provided pointer must 8-bytes aligned.
|
|
|
|
* It must outlive dictionary usage.
|
|
|
|
* workspaceSize: Use ZSTD_estimateCDictSize()
|
|
|
|
* to determine how large workspace must be.
|
|
|
|
* cParams : use ZSTD_getCParams() to transform a compression level
|
|
|
|
* into its relevants cParams.
|
|
|
|
* @return : pointer to ZSTD_CDict*, or NULL if error (size too small)
|
|
|
|
* Note : there is no corresponding "free" function.
|
|
|
|
* Since workspace was allocated externally, it must be freed externally.
|
|
|
|
*/
|
|
|
|
ZSTD_CDict* ZSTD_initStaticCDict(void* workspace, size_t workspaceSize,
|
|
|
|
const void* dict, size_t dictSize, unsigned byReference,
|
|
|
|
ZSTD_compressionParameters cParams)
|
|
|
|
{
|
|
|
|
size_t const cctxSize = ZSTD_estimateCCtxSize(cParams);
|
|
|
|
size_t const neededSize = sizeof(ZSTD_CDict) + (byReference ? 0 : dictSize)
|
|
|
|
+ cctxSize;
|
|
|
|
ZSTD_CDict* const cdict = (ZSTD_CDict*) workspace;
|
|
|
|
void* ptr;
|
|
|
|
DEBUGLOG(2, "(size_t)workspace & 7 : %u", (U32)(size_t)workspace & 7);
|
|
|
|
if ((size_t)workspace & 7) return NULL; /* 8-aligned */
|
|
|
|
DEBUGLOG(2, "(workspaceSize < neededSize) : (%u < %u) => %u",
|
|
|
|
(U32)workspaceSize, (U32)neededSize, (U32)(workspaceSize < neededSize));
|
|
|
|
if (workspaceSize < neededSize) return NULL;
|
|
|
|
|
|
|
|
if (!byReference) {
|
|
|
|
memcpy(cdict+1, dict, dictSize);
|
|
|
|
dict = cdict+1;
|
|
|
|
ptr = (char*)workspace + sizeof(ZSTD_CDict) + dictSize;
|
|
|
|
} else {
|
|
|
|
ptr = cdict+1;
|
|
|
|
}
|
|
|
|
cdict->refContext = ZSTD_initStaticCCtx(ptr, cctxSize);
|
|
|
|
|
|
|
|
if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
|
|
|
|
dict, dictSize, 1 /* by Reference */,
|
|
|
|
cParams) ))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return cdict;
|
|
|
|
}
|
|
|
|
|
2016-10-25 23:19:52 +00:00
|
|
|
static ZSTD_parameters ZSTD_getParamsFromCDict(const ZSTD_CDict* cdict) {
|
|
|
|
return ZSTD_getParamsFromCCtx(cdict->refContext);
|
|
|
|
}
|
|
|
|
|
2017-04-18 20:55:53 +00:00
|
|
|
/* ZSTD_compressBegin_usingCDict_advanced() :
|
2017-04-18 00:57:35 +00:00
|
|
|
* cdict must be != NULL */
|
2017-04-18 20:55:53 +00:00
|
|
|
size_t ZSTD_compressBegin_usingCDict_advanced(
|
2017-04-18 00:57:35 +00:00
|
|
|
ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict,
|
|
|
|
ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize)
|
2016-09-15 12:54:07 +00:00
|
|
|
{
|
2017-05-23 18:18:24 +00:00
|
|
|
if (cdict==NULL) return ERROR(dictionary_wrong);
|
2017-05-23 01:21:51 +00:00
|
|
|
{ ZSTD_parameters params = cdict->refContext->appliedParams;
|
2017-04-18 00:57:35 +00:00
|
|
|
params.fParams = fParams;
|
2017-05-23 01:21:51 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_compressBegin_usingCDict_advanced");
|
2017-05-23 18:18:24 +00:00
|
|
|
return ZSTD_compressBegin_internal(cctx, NULL, 0, cdict,
|
|
|
|
params, pledgedSrcSize, ZSTDb_not_buffered);
|
2017-02-09 18:50:43 +00:00
|
|
|
}
|
2016-09-15 12:54:07 +00:00
|
|
|
}
|
|
|
|
|
2017-04-18 00:57:35 +00:00
|
|
|
/* ZSTD_compressBegin_usingCDict() :
|
|
|
|
* pledgedSrcSize=0 means "unknown"
|
|
|
|
* if pledgedSrcSize>0, it will enable contentSizeFlag */
|
2017-04-26 22:42:10 +00:00
|
|
|
size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
|
2017-04-18 00:57:35 +00:00
|
|
|
{
|
2017-04-26 22:42:10 +00:00
|
|
|
ZSTD_frameParameters const fParams = { 0 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_compressBegin_usingCDict : dictIDFlag == %u", !fParams.noDictIDFlag);
|
2017-04-26 22:42:10 +00:00
|
|
|
return ZSTD_compressBegin_usingCDict_advanced(cctx, cdict, fParams, 0);
|
2017-04-18 00:57:35 +00:00
|
|
|
}
|
|
|
|
|
2017-04-27 18:31:55 +00:00
|
|
|
size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx,
|
|
|
|
void* dst, size_t dstCapacity,
|
|
|
|
const void* src, size_t srcSize,
|
|
|
|
const ZSTD_CDict* cdict, ZSTD_frameParameters fParams)
|
|
|
|
{
|
|
|
|
CHECK_F (ZSTD_compressBegin_usingCDict_advanced(cctx, cdict, fParams, srcSize)); /* will check if cdict != NULL */
|
|
|
|
return ZSTD_compressEnd(cctx, dst, dstCapacity, src, srcSize);
|
2017-04-18 00:57:35 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 23:57:57 +00:00
|
|
|
/*! ZSTD_compress_usingCDict() :
|
2017-04-18 00:57:35 +00:00
|
|
|
* Compression using a digested Dictionary.
|
|
|
|
* Faster startup than ZSTD_compress_usingDict(), recommended when same dictionary is used multiple times.
|
|
|
|
* Note that compression parameters are decided at CDict creation time
|
|
|
|
* while frame parameters are hardcoded */
|
2016-09-15 12:54:07 +00:00
|
|
|
size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx,
|
|
|
|
void* dst, size_t dstCapacity,
|
|
|
|
const void* src, size_t srcSize,
|
|
|
|
const ZSTD_CDict* cdict)
|
2016-06-06 22:51:51 +00:00
|
|
|
{
|
2017-04-18 00:57:35 +00:00
|
|
|
ZSTD_frameParameters const fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
|
2017-04-27 18:31:55 +00:00
|
|
|
return ZSTD_compress_usingCDict_advanced(cctx, dst, dstCapacity, src, srcSize, cdict, fParams);
|
2016-06-06 22:51:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-08-12 11:04:27 +00:00
|
|
|
/* ******************************************************************
|
|
|
|
* Streaming
|
|
|
|
********************************************************************/
|
2016-08-11 23:20:36 +00:00
|
|
|
|
|
|
|
ZSTD_CStream* ZSTD_createCStream(void)
|
|
|
|
{
|
2017-05-31 00:11:39 +00:00
|
|
|
return ZSTD_createCStream_advanced(ZSTD_defaultCMem);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem)
|
2017-05-31 00:11:39 +00:00
|
|
|
{ /* CStream and CCtx are now same object */
|
2017-05-10 18:06:06 +00:00
|
|
|
return ZSTD_createCCtx_advanced(customMem);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t ZSTD_freeCStream(ZSTD_CStream* zcs)
|
|
|
|
{
|
2017-05-09 00:15:00 +00:00
|
|
|
return ZSTD_freeCCtx(zcs); /* same object */
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-08-12 11:04:27 +00:00
|
|
|
/*====== Initialization ======*/
|
|
|
|
|
2017-05-19 17:51:30 +00:00
|
|
|
size_t ZSTD_CStreamInSize(void) { return ZSTD_BLOCKSIZE_MAX; }
|
2016-08-11 23:20:36 +00:00
|
|
|
|
2017-04-20 19:50:02 +00:00
|
|
|
size_t ZSTD_CStreamOutSize(void)
|
|
|
|
{
|
2017-05-19 17:51:30 +00:00
|
|
|
return ZSTD_compressBound(ZSTD_BLOCKSIZE_MAX) + ZSTD_blockHeaderSize + 4 /* 32-bits hash */ ;
|
2017-04-20 19:50:02 +00:00
|
|
|
}
|
2016-08-11 23:20:36 +00:00
|
|
|
|
2017-05-23 00:06:04 +00:00
|
|
|
static size_t ZSTD_resetCStream_internal(ZSTD_CStream* zcs,
|
|
|
|
ZSTD_parameters params,
|
|
|
|
unsigned long long pledgedSrcSize)
|
2016-09-15 12:54:07 +00:00
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_resetCStream_internal");
|
2017-04-27 07:29:04 +00:00
|
|
|
|
2017-05-23 18:18:24 +00:00
|
|
|
CHECK_F(ZSTD_compressBegin_internal(zcs, NULL, 0, zcs->cdict,
|
|
|
|
params, pledgedSrcSize, ZSTDb_buffered));
|
2016-09-15 12:54:07 +00:00
|
|
|
|
|
|
|
zcs->inToCompress = 0;
|
|
|
|
zcs->inBuffPos = 0;
|
|
|
|
zcs->inBuffTarget = zcs->blockSize;
|
|
|
|
zcs->outBuffContentSize = zcs->outBuffFlushedSize = 0;
|
2017-05-08 23:08:01 +00:00
|
|
|
zcs->streamStage = zcss_load;
|
2016-09-15 12:54:07 +00:00
|
|
|
zcs->frameEnded = 0;
|
|
|
|
return 0; /* ready to go */
|
|
|
|
}
|
|
|
|
|
2017-05-19 17:17:59 +00:00
|
|
|
size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize)
|
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_parameters params = zcs->requestedParams;
|
2017-05-19 17:17:59 +00:00
|
|
|
params.fParams.contentSizeFlag = (pledgedSrcSize > 0);
|
2017-05-23 00:45:15 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_resetCStream");
|
2017-05-19 17:17:59 +00:00
|
|
|
if (zcs->compressionLevel != ZSTD_CLEVEL_CUSTOM) {
|
|
|
|
params.cParams = ZSTD_getCParams(zcs->compressionLevel, pledgedSrcSize, 0 /* dictSize */);
|
|
|
|
}
|
2017-05-23 18:18:24 +00:00
|
|
|
return ZSTD_resetCStream_internal(zcs, params, pledgedSrcSize);
|
2017-05-19 17:17:59 +00:00
|
|
|
}
|
|
|
|
|
2017-04-27 18:43:04 +00:00
|
|
|
/* ZSTD_initCStream_usingCDict_advanced() :
|
|
|
|
* same as ZSTD_initCStream_usingCDict(), with control over frame parameters */
|
2017-05-19 17:17:59 +00:00
|
|
|
size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs,
|
|
|
|
const ZSTD_CDict* cdict,
|
|
|
|
unsigned long long pledgedSrcSize,
|
|
|
|
ZSTD_frameParameters fParams)
|
|
|
|
{ /* cannot handle NULL cdict (does not know what to do) */
|
|
|
|
if (!cdict) return ERROR(dictionary_wrong);
|
2017-04-11 18:59:44 +00:00
|
|
|
{ ZSTD_parameters params = ZSTD_getParamsFromCDict(cdict);
|
2017-04-27 18:43:04 +00:00
|
|
|
params.fParams = fParams;
|
2017-05-23 00:06:04 +00:00
|
|
|
zcs->requestedParams = params;
|
|
|
|
zcs->compressionLevel = ZSTD_CLEVEL_CUSTOM;
|
2017-04-11 05:24:02 +00:00
|
|
|
zcs->cdict = cdict;
|
2017-05-23 18:18:24 +00:00
|
|
|
return ZSTD_resetCStream_internal(zcs, params, pledgedSrcSize);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
2017-04-11 05:24:02 +00:00
|
|
|
}
|
|
|
|
|
2017-04-27 18:43:04 +00:00
|
|
|
/* note : cdict must outlive compression session */
|
|
|
|
size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict)
|
|
|
|
{
|
2017-05-12 20:53:46 +00:00
|
|
|
ZSTD_frameParameters const fParams = { 0 /* contentSize */, 0 /* checksum */, 0 /* hideDictID */ };
|
2017-05-23 00:06:04 +00:00
|
|
|
/* cannot handle NULL cdict (does not know what to do) */
|
|
|
|
if (!cdict) return ERROR(dictionary_wrong);
|
2017-04-27 18:43:04 +00:00
|
|
|
return ZSTD_initCStream_usingCDict_advanced(zcs, cdict, 0, fParams);
|
|
|
|
}
|
|
|
|
|
2017-04-11 05:24:02 +00:00
|
|
|
static size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
|
|
|
|
const void* dict, size_t dictSize,
|
|
|
|
ZSTD_parameters params, unsigned long long pledgedSrcSize)
|
|
|
|
{
|
|
|
|
assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
|
|
|
|
zcs->cdict = NULL;
|
2016-08-11 23:20:36 +00:00
|
|
|
|
2017-01-17 19:04:08 +00:00
|
|
|
if (dict && dictSize >= 8) {
|
2017-05-23 20:16:00 +00:00
|
|
|
if (zcs->staticSize) { /* static CCtx : never uses malloc */
|
|
|
|
/* incompatible with internal cdict creation */
|
|
|
|
return ERROR(memory_allocation);
|
|
|
|
}
|
2016-10-27 21:20:55 +00:00
|
|
|
ZSTD_freeCDict(zcs->cdictLocal);
|
2017-04-27 07:29:04 +00:00
|
|
|
zcs->cdictLocal = ZSTD_createCDict_advanced(dict, dictSize, 0 /* copy */, params.cParams, zcs->customMem);
|
2016-10-27 21:20:55 +00:00
|
|
|
if (zcs->cdictLocal == NULL) return ERROR(memory_allocation);
|
|
|
|
zcs->cdict = zcs->cdictLocal;
|
2017-04-11 05:24:02 +00:00
|
|
|
}
|
2016-09-15 12:54:07 +00:00
|
|
|
|
2017-05-23 18:18:24 +00:00
|
|
|
return ZSTD_resetCStream_internal(zcs, params, pledgedSrcSize);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
2017-04-11 00:50:44 +00:00
|
|
|
size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs,
|
|
|
|
const void* dict, size_t dictSize,
|
|
|
|
ZSTD_parameters params, unsigned long long pledgedSrcSize)
|
2016-10-25 23:19:52 +00:00
|
|
|
{
|
2017-04-11 00:50:44 +00:00
|
|
|
CHECK_F( ZSTD_checkCParams(params.cParams) );
|
2017-05-23 00:06:04 +00:00
|
|
|
zcs->requestedParams = params;
|
|
|
|
zcs->compressionLevel = ZSTD_CLEVEL_CUSTOM;
|
2017-04-11 00:50:44 +00:00
|
|
|
return ZSTD_initCStream_internal(zcs, dict, dictSize, params, pledgedSrcSize);
|
2016-10-25 23:19:52 +00:00
|
|
|
}
|
|
|
|
|
2016-08-11 23:20:36 +00:00
|
|
|
size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, const void* dict, size_t dictSize, int compressionLevel)
|
|
|
|
{
|
|
|
|
ZSTD_parameters const params = ZSTD_getParams(compressionLevel, 0, dictSize);
|
2017-05-23 00:06:04 +00:00
|
|
|
zcs->compressionLevel = compressionLevel;
|
2017-04-11 00:50:44 +00:00
|
|
|
return ZSTD_initCStream_internal(zcs, dict, dictSize, params, 0);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
2016-12-13 15:39:36 +00:00
|
|
|
size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs, int compressionLevel, unsigned long long pledgedSrcSize)
|
|
|
|
{
|
2016-12-18 20:39:15 +00:00
|
|
|
ZSTD_parameters params = ZSTD_getParams(compressionLevel, pledgedSrcSize, 0);
|
2017-04-11 05:24:02 +00:00
|
|
|
params.fParams.contentSizeFlag = (pledgedSrcSize>0);
|
2017-04-11 00:50:44 +00:00
|
|
|
return ZSTD_initCStream_internal(zcs, NULL, 0, params, pledgedSrcSize);
|
2016-12-13 15:39:36 +00:00
|
|
|
}
|
|
|
|
|
2016-08-11 23:20:36 +00:00
|
|
|
size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel)
|
|
|
|
{
|
2017-04-11 05:24:02 +00:00
|
|
|
ZSTD_parameters const params = ZSTD_getParams(compressionLevel, 0, 0);
|
|
|
|
return ZSTD_initCStream_internal(zcs, NULL, 0, params, 0);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
2016-08-12 11:04:27 +00:00
|
|
|
/*====== Compression ======*/
|
2016-08-11 23:20:36 +00:00
|
|
|
|
2017-05-31 01:10:26 +00:00
|
|
|
MEM_STATIC size_t ZSTD_limitCopy(void* dst, size_t dstCapacity,
|
|
|
|
const void* src, size_t srcSize)
|
2016-08-11 23:20:36 +00:00
|
|
|
{
|
|
|
|
size_t const length = MIN(dstCapacity, srcSize);
|
2017-05-31 16:59:22 +00:00
|
|
|
if (length) memcpy(dst, src, length);
|
2016-08-11 23:20:36 +00:00
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t ZSTD_compressStream_generic(ZSTD_CStream* zcs,
|
2017-05-31 01:10:26 +00:00
|
|
|
ZSTD_outBuffer* output,
|
|
|
|
ZSTD_inBuffer* input,
|
|
|
|
ZSTD_EndDirective const flushMode)
|
2016-08-11 23:20:36 +00:00
|
|
|
{
|
|
|
|
U32 someMoreWork = 1;
|
2017-05-31 01:10:26 +00:00
|
|
|
const char* const istart = (const char*)input->src;
|
|
|
|
const char* const iend = istart + input->size;
|
|
|
|
const char* ip = istart + input->pos;
|
|
|
|
char* const ostart = (char*)output->dst;
|
|
|
|
char* const oend = ostart + output->size;
|
|
|
|
char* op = ostart + output->pos;
|
|
|
|
|
|
|
|
/* expected to be already allocated */
|
2017-05-18 01:36:15 +00:00
|
|
|
assert(zcs->inBuff != NULL);
|
|
|
|
assert(zcs->outBuff!= NULL);
|
2017-05-19 17:17:59 +00:00
|
|
|
|
2016-08-11 23:20:36 +00:00
|
|
|
while (someMoreWork) {
|
2017-05-08 23:08:01 +00:00
|
|
|
switch(zcs->streamStage)
|
2016-08-11 23:20:36 +00:00
|
|
|
{
|
2017-05-23 00:06:04 +00:00
|
|
|
case zcss_init:
|
|
|
|
/* call ZSTD_initCStream() first ! */
|
|
|
|
return ERROR(init_missing);
|
2016-08-11 23:20:36 +00:00
|
|
|
|
|
|
|
case zcss_load:
|
|
|
|
/* complete inBuffer */
|
|
|
|
{ size_t const toLoad = zcs->inBuffTarget - zcs->inBuffPos;
|
2017-05-31 17:03:20 +00:00
|
|
|
size_t const loaded = ZSTD_limitCopy(
|
|
|
|
zcs->inBuff + zcs->inBuffPos, toLoad,
|
|
|
|
ip, iend-ip);
|
2016-08-11 23:20:36 +00:00
|
|
|
zcs->inBuffPos += loaded;
|
|
|
|
ip += loaded;
|
2017-05-19 17:17:59 +00:00
|
|
|
if ( (flushMode == ZSTD_e_continue)
|
|
|
|
&& (zcs->inBuffPos < zcs->inBuffTarget) ) {
|
|
|
|
/* not enough input to fill full block : stop here */
|
|
|
|
someMoreWork = 0; break;
|
|
|
|
}
|
|
|
|
if ( (flushMode == ZSTD_e_flush)
|
|
|
|
&& (zcs->inBuffPos == zcs->inToCompress) ) {
|
|
|
|
/* empty */
|
|
|
|
someMoreWork = 0; break;
|
|
|
|
}
|
|
|
|
}
|
2016-08-11 23:20:36 +00:00
|
|
|
/* compress current block (note : this stage cannot be stopped in the middle) */
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "stream compression stage (flushMode==%u)", flushMode);
|
2016-08-11 23:20:36 +00:00
|
|
|
{ void* cDst;
|
|
|
|
size_t cSize;
|
|
|
|
size_t const iSize = zcs->inBuffPos - zcs->inToCompress;
|
|
|
|
size_t oSize = oend-op;
|
2017-05-19 17:17:59 +00:00
|
|
|
unsigned const lastBlock = (flushMode == ZSTD_e_end) && (ip==iend);
|
2016-08-11 23:20:36 +00:00
|
|
|
if (oSize >= ZSTD_compressBound(iSize))
|
2017-05-19 17:17:59 +00:00
|
|
|
cDst = op; /* compress directly into output buffer (skip flush stage) */
|
2016-08-11 23:20:36 +00:00
|
|
|
else
|
|
|
|
cDst = zcs->outBuff, oSize = zcs->outBuffSize;
|
2017-05-19 17:17:59 +00:00
|
|
|
cSize = lastBlock ?
|
|
|
|
ZSTD_compressEnd(zcs, cDst, oSize,
|
|
|
|
zcs->inBuff + zcs->inToCompress, iSize) :
|
|
|
|
ZSTD_compressContinue(zcs, cDst, oSize,
|
|
|
|
zcs->inBuff + zcs->inToCompress, iSize);
|
2016-08-11 23:20:36 +00:00
|
|
|
if (ZSTD_isError(cSize)) return cSize;
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "cSize = %u (lastBlock:%u)", (U32)cSize, lastBlock);
|
|
|
|
zcs->frameEnded = lastBlock;
|
2016-08-11 23:20:36 +00:00
|
|
|
/* prepare next block */
|
|
|
|
zcs->inBuffTarget = zcs->inBuffPos + zcs->blockSize;
|
|
|
|
if (zcs->inBuffTarget > zcs->inBuffSize)
|
2017-05-19 17:17:59 +00:00
|
|
|
zcs->inBuffPos = 0, zcs->inBuffTarget = zcs->blockSize;
|
2017-05-20 02:46:15 +00:00
|
|
|
DEBUGLOG(5, "inBuffTarget:%u / inBuffSize:%u",
|
|
|
|
(U32)zcs->inBuffTarget, (U32)zcs->inBuffSize);
|
|
|
|
if (!lastBlock)
|
|
|
|
assert(zcs->inBuffTarget <= zcs->inBuffSize);
|
2016-08-11 23:20:36 +00:00
|
|
|
zcs->inToCompress = zcs->inBuffPos;
|
2017-05-19 17:17:59 +00:00
|
|
|
if (cDst == op) { /* no need to flush */
|
|
|
|
op += cSize;
|
|
|
|
if (zcs->frameEnded) {
|
|
|
|
DEBUGLOG(5, "Frame directly completed");
|
|
|
|
someMoreWork = 0;
|
|
|
|
zcs->streamStage = zcss_init;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2016-08-11 23:20:36 +00:00
|
|
|
zcs->outBuffContentSize = cSize;
|
|
|
|
zcs->outBuffFlushedSize = 0;
|
2017-05-19 17:17:59 +00:00
|
|
|
zcs->streamStage = zcss_flush; /* pass-through to flush stage */
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
2017-05-11 07:47:20 +00:00
|
|
|
/* fall-through */
|
2016-08-11 23:20:36 +00:00
|
|
|
case zcss_flush:
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "flush stage");
|
2016-08-11 23:20:36 +00:00
|
|
|
{ size_t const toFlush = zcs->outBuffContentSize - zcs->outBuffFlushedSize;
|
2017-05-31 01:10:26 +00:00
|
|
|
size_t const flushed = ZSTD_limitCopy(op, oend-op,
|
|
|
|
zcs->outBuff + zcs->outBuffFlushedSize, toFlush);
|
2017-05-19 17:17:59 +00:00
|
|
|
DEBUGLOG(5, "toFlush: %u ; flushed: %u", (U32)toFlush, (U32)flushed);
|
2016-08-11 23:20:36 +00:00
|
|
|
op += flushed;
|
|
|
|
zcs->outBuffFlushedSize += flushed;
|
2017-05-31 01:10:26 +00:00
|
|
|
if (toFlush!=flushed) {
|
|
|
|
/* dst too small to store flushed data : stop there */
|
|
|
|
someMoreWork = 0;
|
|
|
|
break;
|
|
|
|
}
|
2016-08-11 23:20:36 +00:00
|
|
|
zcs->outBuffContentSize = zcs->outBuffFlushedSize = 0;
|
2017-05-19 17:17:59 +00:00
|
|
|
if (zcs->frameEnded) {
|
|
|
|
DEBUGLOG(5, "Frame completed");
|
|
|
|
someMoreWork = 0;
|
|
|
|
zcs->streamStage = zcss_init;
|
|
|
|
break;
|
|
|
|
}
|
2017-05-08 23:08:01 +00:00
|
|
|
zcs->streamStage = zcss_load;
|
2016-08-11 23:20:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case zcss_final:
|
2017-05-19 17:17:59 +00:00
|
|
|
someMoreWork = 0; break; /* useless */
|
2016-08-11 23:20:36 +00:00
|
|
|
|
2017-06-01 16:44:54 +00:00
|
|
|
default: /* impossible */
|
|
|
|
assert(0);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-31 01:10:26 +00:00
|
|
|
input->pos = ip - istart;
|
|
|
|
output->pos = op - ostart;
|
2016-08-11 23:20:36 +00:00
|
|
|
if (zcs->frameEnded) return 0;
|
|
|
|
{ size_t hintInSize = zcs->inBuffTarget - zcs->inBuffPos;
|
|
|
|
if (hintInSize==0) hintInSize = zcs->blockSize;
|
|
|
|
return hintInSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-16 23:39:22 +00:00
|
|
|
size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
|
|
|
|
{
|
2017-05-31 01:10:26 +00:00
|
|
|
/* check conditions */
|
|
|
|
if (output->pos > output->size) return ERROR(GENERIC);
|
|
|
|
if (input->pos > input->size) return ERROR(GENERIC);
|
|
|
|
|
|
|
|
return ZSTD_compressStream_generic(zcs, output, input, ZSTD_e_continue);
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
2017-05-31 00:42:00 +00:00
|
|
|
size_t ZSTD_compress_generic (ZSTD_CCtx* cctx,
|
|
|
|
ZSTD_outBuffer* output,
|
|
|
|
ZSTD_inBuffer* input,
|
|
|
|
ZSTD_EndDirective endOp)
|
2017-05-18 01:36:15 +00:00
|
|
|
{
|
|
|
|
/* check conditions */
|
2017-05-31 00:42:00 +00:00
|
|
|
if (output->pos > output->size) return ERROR(GENERIC);
|
|
|
|
if (input->pos > input->size) return ERROR(GENERIC);
|
2017-05-18 01:36:15 +00:00
|
|
|
assert(cctx!=NULL);
|
2017-05-31 01:10:26 +00:00
|
|
|
|
2017-05-18 01:36:15 +00:00
|
|
|
if (cctx->streamStage == zcss_init) {
|
|
|
|
/* transparent reset */
|
2017-05-23 00:06:04 +00:00
|
|
|
ZSTD_parameters params = cctx->requestedParams;
|
2017-05-31 00:42:00 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_compress_generic : transparent reset");
|
2017-05-18 01:36:15 +00:00
|
|
|
if (cctx->compressionLevel != ZSTD_CLEVEL_CUSTOM)
|
|
|
|
params.cParams = ZSTD_getCParams(cctx->compressionLevel,
|
|
|
|
cctx->frameContentSize, 0 /* dictSize */);
|
2017-05-23 18:18:24 +00:00
|
|
|
CHECK_F( ZSTD_resetCStream_internal(cctx, params, cctx->frameContentSize) );
|
2017-05-18 01:36:15 +00:00
|
|
|
}
|
|
|
|
|
2017-05-31 01:10:26 +00:00
|
|
|
DEBUGLOG(5, "starting ZSTD_compressStream_generic");
|
|
|
|
CHECK_F( ZSTD_compressStream_generic(cctx, output, input, endOp) );
|
|
|
|
|
2017-05-18 01:36:15 +00:00
|
|
|
DEBUGLOG(5, "completing ZSTD_compress_generic_integral");
|
2017-05-31 00:42:00 +00:00
|
|
|
return cctx->outBuffContentSize - cctx->outBuffFlushedSize; /* remaining to flush */
|
2017-05-18 01:36:15 +00:00
|
|
|
}
|
|
|
|
|
2017-05-31 00:42:00 +00:00
|
|
|
size_t ZSTD_compress_generic_simpleArgs (
|
|
|
|
ZSTD_CCtx* cctx,
|
|
|
|
void* dst, size_t dstCapacity, size_t* dstPos,
|
|
|
|
const void* src, size_t srcSize, size_t* srcPos,
|
|
|
|
ZSTD_EndDirective endOp)
|
2017-05-18 01:36:15 +00:00
|
|
|
{
|
2017-05-31 00:42:00 +00:00
|
|
|
ZSTD_outBuffer output = { dst, dstCapacity, *dstPos };
|
|
|
|
ZSTD_inBuffer input = { src, srcSize, *srcPos };
|
2017-05-31 01:10:26 +00:00
|
|
|
/* ZSTD_compress_generic() will check validity of dstPos and srcPos */
|
2017-05-31 00:42:00 +00:00
|
|
|
size_t const hint = ZSTD_compress_generic(cctx, &output, &input, endOp);
|
|
|
|
if (ZSTD_isError(hint)) return hint;
|
|
|
|
|
|
|
|
*dstPos = output.pos;
|
|
|
|
*srcPos = input.pos;
|
|
|
|
return hint;
|
2017-05-31 01:10:26 +00:00
|
|
|
|
2017-05-18 01:36:15 +00:00
|
|
|
}
|
|
|
|
|
2016-08-11 23:20:36 +00:00
|
|
|
|
2016-08-12 11:04:27 +00:00
|
|
|
/*====== Finalize ======*/
|
2016-08-11 23:20:36 +00:00
|
|
|
|
|
|
|
/*! ZSTD_flushStream() :
|
|
|
|
* @return : amount of data remaining to flush */
|
2016-08-16 23:39:22 +00:00
|
|
|
size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output)
|
2016-08-11 23:20:36 +00:00
|
|
|
{
|
2017-05-31 16:59:22 +00:00
|
|
|
ZSTD_inBuffer input = { NULL, 0, 0 };
|
2017-05-31 01:10:26 +00:00
|
|
|
if (output->pos > output->size) return ERROR(GENERIC);
|
|
|
|
CHECK_F( ZSTD_compressStream_generic(zcs, output, &input, ZSTD_e_flush) );
|
|
|
|
return zcs->outBuffContentSize - zcs->outBuffFlushedSize; /* remaining to flush */
|
2016-08-11 23:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-08-16 23:39:22 +00:00
|
|
|
size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output)
|
2016-08-11 23:20:36 +00:00
|
|
|
{
|
2017-05-31 16:59:22 +00:00
|
|
|
ZSTD_inBuffer input = { NULL, 0, 0 };
|
2017-05-31 01:10:26 +00:00
|
|
|
if (output->pos > output->size) return ERROR(GENERIC);
|
|
|
|
CHECK_F( ZSTD_compressStream_generic(zcs, output, &input, ZSTD_e_end) );
|
2017-05-19 17:17:59 +00:00
|
|
|
|
2017-05-19 17:56:11 +00:00
|
|
|
DEBUGLOG(5, "ZSTD_endStream : remaining to flush : %u",
|
2017-05-19 17:17:59 +00:00
|
|
|
(unsigned)(zcs->outBuffContentSize - zcs->outBuffFlushedSize));
|
|
|
|
return zcs->outBuffContentSize - zcs->outBuffFlushedSize;
|
|
|
|
}
|
2016-08-11 23:20:36 +00:00
|
|
|
|
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
/*-===== Pre-defined compression levels =====-*/
|
2016-01-30 02:14:15 +00:00
|
|
|
|
2016-04-15 11:44:46 +00:00
|
|
|
#define ZSTD_MAX_CLEVEL 22
|
2016-07-27 13:09:11 +00:00
|
|
|
int ZSTD_maxCLevel(void) { return ZSTD_MAX_CLEVEL; }
|
2016-02-03 01:11:32 +00:00
|
|
|
|
2016-03-30 17:48:05 +00:00
|
|
|
static const ZSTD_compressionParameters ZSTD_defaultCParameters[4][ZSTD_MAX_CLEVEL+1] = {
|
2016-01-30 02:14:15 +00:00
|
|
|
{ /* "default" */
|
2016-04-09 18:32:00 +00:00
|
|
|
/* W, C, H, S, L, TL, strat */
|
2016-08-26 18:02:49 +00:00
|
|
|
{ 18, 12, 12, 1, 7, 16, ZSTD_fast }, /* level 0 - never used */
|
2016-07-13 12:56:24 +00:00
|
|
|
{ 19, 13, 14, 1, 7, 16, ZSTD_fast }, /* level 1 */
|
|
|
|
{ 19, 15, 16, 1, 6, 16, ZSTD_fast }, /* level 2 */
|
2016-08-26 18:02:49 +00:00
|
|
|
{ 20, 16, 17, 1, 5, 16, ZSTD_dfast }, /* level 3.*/
|
|
|
|
{ 20, 18, 18, 1, 5, 16, ZSTD_dfast }, /* level 4.*/
|
2016-07-13 12:56:24 +00:00
|
|
|
{ 20, 15, 18, 3, 5, 16, ZSTD_greedy }, /* level 5 */
|
|
|
|
{ 21, 16, 19, 2, 5, 16, ZSTD_lazy }, /* level 6 */
|
|
|
|
{ 21, 17, 20, 3, 5, 16, ZSTD_lazy }, /* level 7 */
|
2016-08-26 18:02:49 +00:00
|
|
|
{ 21, 18, 20, 3, 5, 16, ZSTD_lazy2 }, /* level 8 */
|
2016-07-13 12:56:24 +00:00
|
|
|
{ 21, 20, 20, 3, 5, 16, ZSTD_lazy2 }, /* level 9 */
|
|
|
|
{ 21, 19, 21, 4, 5, 16, ZSTD_lazy2 }, /* level 10 */
|
|
|
|
{ 22, 20, 22, 4, 5, 16, ZSTD_lazy2 }, /* level 11 */
|
|
|
|
{ 22, 20, 22, 5, 5, 16, ZSTD_lazy2 }, /* level 12 */
|
|
|
|
{ 22, 21, 22, 5, 5, 16, ZSTD_lazy2 }, /* level 13 */
|
|
|
|
{ 22, 21, 22, 6, 5, 16, ZSTD_lazy2 }, /* level 14 */
|
|
|
|
{ 22, 21, 21, 5, 5, 16, ZSTD_btlazy2 }, /* level 15 */
|
|
|
|
{ 23, 22, 22, 5, 5, 16, ZSTD_btlazy2 }, /* level 16 */
|
2016-08-26 18:02:49 +00:00
|
|
|
{ 23, 21, 22, 4, 5, 24, ZSTD_btopt }, /* level 17 */
|
2017-04-28 00:44:01 +00:00
|
|
|
{ 23, 22, 22, 5, 4, 32, ZSTD_btopt }, /* level 18 */
|
2016-08-26 18:02:49 +00:00
|
|
|
{ 23, 23, 22, 6, 3, 48, ZSTD_btopt }, /* level 19 */
|
2017-05-11 00:48:42 +00:00
|
|
|
{ 25, 25, 23, 7, 3, 64, ZSTD_btultra }, /* level 20 */
|
|
|
|
{ 26, 26, 23, 7, 3,256, ZSTD_btultra }, /* level 21 */
|
|
|
|
{ 27, 27, 25, 9, 3,512, ZSTD_btultra }, /* level 22 */
|
2016-01-30 02:14:15 +00:00
|
|
|
},
|
|
|
|
{ /* for srcSize <= 256 KB */
|
2016-03-30 17:48:05 +00:00
|
|
|
/* W, C, H, S, L, T, strat */
|
2016-08-26 18:02:49 +00:00
|
|
|
{ 0, 0, 0, 0, 0, 0, ZSTD_fast }, /* level 0 - not used */
|
2016-08-24 17:42:15 +00:00
|
|
|
{ 18, 13, 14, 1, 6, 8, ZSTD_fast }, /* level 1 */
|
2016-08-24 12:22:26 +00:00
|
|
|
{ 18, 14, 13, 1, 5, 8, ZSTD_dfast }, /* level 2 */
|
|
|
|
{ 18, 16, 15, 1, 5, 8, ZSTD_dfast }, /* level 3 */
|
|
|
|
{ 18, 15, 17, 1, 5, 8, ZSTD_greedy }, /* level 4.*/
|
|
|
|
{ 18, 16, 17, 4, 5, 8, ZSTD_greedy }, /* level 5.*/
|
|
|
|
{ 18, 16, 17, 3, 5, 8, ZSTD_lazy }, /* level 6.*/
|
|
|
|
{ 18, 17, 17, 4, 4, 8, ZSTD_lazy }, /* level 7 */
|
|
|
|
{ 18, 17, 17, 4, 4, 8, ZSTD_lazy2 }, /* level 8 */
|
|
|
|
{ 18, 17, 17, 5, 4, 8, ZSTD_lazy2 }, /* level 9 */
|
|
|
|
{ 18, 17, 17, 6, 4, 8, ZSTD_lazy2 }, /* level 10 */
|
|
|
|
{ 18, 18, 17, 6, 4, 8, ZSTD_lazy2 }, /* level 11.*/
|
|
|
|
{ 18, 18, 17, 7, 4, 8, ZSTD_lazy2 }, /* level 12.*/
|
|
|
|
{ 18, 19, 17, 6, 4, 8, ZSTD_btlazy2 }, /* level 13 */
|
2016-04-08 10:36:19 +00:00
|
|
|
{ 18, 18, 18, 4, 4, 16, ZSTD_btopt }, /* level 14.*/
|
2016-08-24 12:22:26 +00:00
|
|
|
{ 18, 18, 18, 4, 3, 16, ZSTD_btopt }, /* level 15.*/
|
|
|
|
{ 18, 19, 18, 6, 3, 32, ZSTD_btopt }, /* level 16.*/
|
|
|
|
{ 18, 19, 18, 8, 3, 64, ZSTD_btopt }, /* level 17.*/
|
2016-04-08 10:36:19 +00:00
|
|
|
{ 18, 19, 18, 9, 3,128, ZSTD_btopt }, /* level 18.*/
|
|
|
|
{ 18, 19, 18, 10, 3,256, ZSTD_btopt }, /* level 19.*/
|
2017-05-11 00:48:42 +00:00
|
|
|
{ 18, 19, 18, 11, 3,512, ZSTD_btultra }, /* level 20.*/
|
|
|
|
{ 18, 19, 18, 12, 3,512, ZSTD_btultra }, /* level 21.*/
|
|
|
|
{ 18, 19, 18, 13, 3,512, ZSTD_btultra }, /* level 22.*/
|
2016-01-30 02:14:15 +00:00
|
|
|
},
|
|
|
|
{ /* for srcSize <= 128 KB */
|
2016-03-30 17:48:05 +00:00
|
|
|
/* W, C, H, S, L, T, strat */
|
2016-07-22 12:36:46 +00:00
|
|
|
{ 17, 12, 12, 1, 7, 8, ZSTD_fast }, /* level 0 - not used */
|
|
|
|
{ 17, 12, 13, 1, 6, 8, ZSTD_fast }, /* level 1 */
|
|
|
|
{ 17, 13, 16, 1, 5, 8, ZSTD_fast }, /* level 2 */
|
|
|
|
{ 17, 16, 16, 2, 5, 8, ZSTD_dfast }, /* level 3 */
|
|
|
|
{ 17, 13, 15, 3, 4, 8, ZSTD_greedy }, /* level 4 */
|
|
|
|
{ 17, 15, 17, 4, 4, 8, ZSTD_greedy }, /* level 5 */
|
|
|
|
{ 17, 16, 17, 3, 4, 8, ZSTD_lazy }, /* level 6 */
|
|
|
|
{ 17, 15, 17, 4, 4, 8, ZSTD_lazy2 }, /* level 7 */
|
|
|
|
{ 17, 17, 17, 4, 4, 8, ZSTD_lazy2 }, /* level 8 */
|
|
|
|
{ 17, 17, 17, 5, 4, 8, ZSTD_lazy2 }, /* level 9 */
|
|
|
|
{ 17, 17, 17, 6, 4, 8, ZSTD_lazy2 }, /* level 10 */
|
|
|
|
{ 17, 17, 17, 7, 4, 8, ZSTD_lazy2 }, /* level 11 */
|
|
|
|
{ 17, 17, 17, 8, 4, 8, ZSTD_lazy2 }, /* level 12 */
|
|
|
|
{ 17, 18, 17, 6, 4, 8, ZSTD_btlazy2 }, /* level 13.*/
|
2016-03-30 17:48:05 +00:00
|
|
|
{ 17, 17, 17, 7, 3, 8, ZSTD_btopt }, /* level 14.*/
|
|
|
|
{ 17, 17, 17, 7, 3, 16, ZSTD_btopt }, /* level 15.*/
|
|
|
|
{ 17, 18, 17, 7, 3, 32, ZSTD_btopt }, /* level 16.*/
|
|
|
|
{ 17, 18, 17, 7, 3, 64, ZSTD_btopt }, /* level 17.*/
|
|
|
|
{ 17, 18, 17, 7, 3,256, ZSTD_btopt }, /* level 18.*/
|
|
|
|
{ 17, 18, 17, 8, 3,256, ZSTD_btopt }, /* level 19.*/
|
2017-05-11 00:48:42 +00:00
|
|
|
{ 17, 18, 17, 9, 3,256, ZSTD_btultra }, /* level 20.*/
|
|
|
|
{ 17, 18, 17, 10, 3,256, ZSTD_btultra }, /* level 21.*/
|
|
|
|
{ 17, 18, 17, 11, 3,512, ZSTD_btultra }, /* level 22.*/
|
2016-01-30 02:14:15 +00:00
|
|
|
},
|
|
|
|
{ /* for srcSize <= 16 KB */
|
2016-03-30 17:48:05 +00:00
|
|
|
/* W, C, H, S, L, T, strat */
|
2016-07-13 13:16:00 +00:00
|
|
|
{ 14, 12, 12, 1, 7, 6, ZSTD_fast }, /* level 0 - not used */
|
2016-07-17 14:21:37 +00:00
|
|
|
{ 14, 14, 14, 1, 6, 6, ZSTD_fast }, /* level 1 */
|
2016-07-13 13:16:00 +00:00
|
|
|
{ 14, 14, 14, 1, 4, 6, ZSTD_fast }, /* level 2 */
|
|
|
|
{ 14, 14, 14, 1, 4, 6, ZSTD_dfast }, /* level 3.*/
|
|
|
|
{ 14, 14, 14, 4, 4, 6, ZSTD_greedy }, /* level 4.*/
|
|
|
|
{ 14, 14, 14, 3, 4, 6, ZSTD_lazy }, /* level 5.*/
|
|
|
|
{ 14, 14, 14, 4, 4, 6, ZSTD_lazy2 }, /* level 6 */
|
|
|
|
{ 14, 14, 14, 5, 4, 6, ZSTD_lazy2 }, /* level 7 */
|
|
|
|
{ 14, 14, 14, 6, 4, 6, ZSTD_lazy2 }, /* level 8.*/
|
|
|
|
{ 14, 15, 14, 6, 4, 6, ZSTD_btlazy2 }, /* level 9.*/
|
2016-03-30 17:48:05 +00:00
|
|
|
{ 14, 15, 14, 3, 3, 6, ZSTD_btopt }, /* level 10.*/
|
|
|
|
{ 14, 15, 14, 6, 3, 8, ZSTD_btopt }, /* level 11.*/
|
|
|
|
{ 14, 15, 14, 6, 3, 16, ZSTD_btopt }, /* level 12.*/
|
|
|
|
{ 14, 15, 14, 6, 3, 24, ZSTD_btopt }, /* level 13.*/
|
|
|
|
{ 14, 15, 15, 6, 3, 48, ZSTD_btopt }, /* level 14.*/
|
|
|
|
{ 14, 15, 15, 6, 3, 64, ZSTD_btopt }, /* level 15.*/
|
|
|
|
{ 14, 15, 15, 6, 3, 96, ZSTD_btopt }, /* level 16.*/
|
|
|
|
{ 14, 15, 15, 6, 3,128, ZSTD_btopt }, /* level 17.*/
|
|
|
|
{ 14, 15, 15, 6, 3,256, ZSTD_btopt }, /* level 18.*/
|
|
|
|
{ 14, 15, 15, 7, 3,256, ZSTD_btopt }, /* level 19.*/
|
2017-05-11 00:48:42 +00:00
|
|
|
{ 14, 15, 15, 8, 3,256, ZSTD_btultra }, /* level 20.*/
|
|
|
|
{ 14, 15, 15, 9, 3,256, ZSTD_btultra }, /* level 21.*/
|
|
|
|
{ 14, 15, 15, 10, 3,256, ZSTD_btultra }, /* level 22.*/
|
2016-01-30 02:14:15 +00:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2016-05-18 10:06:33 +00:00
|
|
|
/*! ZSTD_getCParams() :
|
|
|
|
* @return ZSTD_compressionParameters structure for a selected compression level, `srcSize` and `dictSize`.
|
|
|
|
* Size values are optional, provide 0 if not known or unused */
|
2017-05-19 17:17:59 +00:00
|
|
|
ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize)
|
2016-01-30 02:14:15 +00:00
|
|
|
{
|
2016-04-04 02:22:53 +00:00
|
|
|
ZSTD_compressionParameters cp;
|
2017-05-19 17:17:59 +00:00
|
|
|
size_t const addedSize = srcSizeHint ? 0 : 500;
|
|
|
|
U64 const rSize = srcSizeHint+dictSize ? srcSizeHint+dictSize+addedSize : (U64)-1;
|
2016-03-30 17:48:05 +00:00
|
|
|
U32 const tableID = (rSize <= 256 KB) + (rSize <= 128 KB) + (rSize <= 16 KB); /* intentional underflow for srcSizeHint == 0 */
|
2017-05-18 01:36:15 +00:00
|
|
|
if (compressionLevel <= 0) compressionLevel = ZSTD_CLEVEL_DEFAULT; /* 0 == default; no negative compressionLevel yet */
|
2016-01-30 02:14:15 +00:00
|
|
|
if (compressionLevel > ZSTD_MAX_CLEVEL) compressionLevel = ZSTD_MAX_CLEVEL;
|
2016-04-04 02:22:53 +00:00
|
|
|
cp = ZSTD_defaultCParameters[tableID][compressionLevel];
|
2016-04-04 11:28:28 +00:00
|
|
|
if (MEM_32bits()) { /* auto-correction, for 32-bits mode */
|
|
|
|
if (cp.windowLog > ZSTD_WINDOWLOG_MAX) cp.windowLog = ZSTD_WINDOWLOG_MAX;
|
2016-04-04 11:49:18 +00:00
|
|
|
if (cp.chainLog > ZSTD_CHAINLOG_MAX) cp.chainLog = ZSTD_CHAINLOG_MAX;
|
2016-04-04 11:28:28 +00:00
|
|
|
if (cp.hashLog > ZSTD_HASHLOG_MAX) cp.hashLog = ZSTD_HASHLOG_MAX;
|
|
|
|
}
|
2017-05-19 17:17:59 +00:00
|
|
|
cp = ZSTD_adjustCParams(cp, srcSizeHint, dictSize);
|
2016-04-04 02:22:53 +00:00
|
|
|
return cp;
|
2016-01-30 02:14:15 +00:00
|
|
|
}
|
2016-06-27 13:12:26 +00:00
|
|
|
|
|
|
|
/*! ZSTD_getParams() :
|
2016-07-12 11:42:10 +00:00
|
|
|
* same as ZSTD_getCParams(), but @return a `ZSTD_parameters` object (instead of `ZSTD_compressionParameters`).
|
2016-06-27 13:12:26 +00:00
|
|
|
* All fields of `ZSTD_frameParameters` are set to default (0) */
|
2017-05-19 17:17:59 +00:00
|
|
|
ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize) {
|
2016-06-27 13:12:26 +00:00
|
|
|
ZSTD_parameters params;
|
2017-05-19 17:17:59 +00:00
|
|
|
ZSTD_compressionParameters const cParams = ZSTD_getCParams(compressionLevel, srcSizeHint, dictSize);
|
2016-06-27 13:12:26 +00:00
|
|
|
memset(¶ms, 0, sizeof(params));
|
|
|
|
params.cParams = cParams;
|
|
|
|
return params;
|
|
|
|
}
|