facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more merge conflicts

Browse Source
This commit is contained in:
Sen Huang 2019-11-05 15:54:05 -05:00
parent 7ce891870c
commit f2932fb5eb
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/compress/zstd_compress_superblock.c
View File

@ -651,12 +651,15 @@ static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
litSize = 0; litSize = 0;
seqCount = 0; seqCount = 0;
while (sp + seqCount < send) { while (sp + seqCount < send) {
// TODO this is crude estimate for now...
// Ask Yann, Nick for feedback.
const seqDef* const sequence = sp + seqCount; const seqDef* const sequence = sp + seqCount;
const U32 lastSequence = sequence+1 == send; const U32 lastSequence = sequence+1 == send;
litSize = (sequence == send) ? (size_t)(lend-lp) : litSize + sequence->litLength; litSize = (sequence == send) ? (size_t)(lend-lp) : litSize + sequence->litLength;
seqCount++; seqCount++;
/* I think there is an optimization opportunity here.
* Calling ZSTD_estimateSubBlockSize for every sequence can be wasteful
* since it recalculates estimate from scratch.
* For example, it would recount literal distribution and symbol codes everytime.
*/
cBlockSizeEstimate = ZSTD_estimateSubBlockSize(lp, litSize, ofCodePtr, llCodePtr, mlCodePtr, seqCount, cBlockSizeEstimate = ZSTD_estimateSubBlockSize(lp, litSize, ofCodePtr, llCodePtr, mlCodePtr, seqCount,
entropy, entropyMetadata, entropy, entropyMetadata,
workspace, wkspSize, writeEntropy); workspace, wkspSize, writeEntropy);

2
tests/fuzz/dictionary_round_trip.c
View File

@ -73,7 +73,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *src, size_t size)
size_t const rBufSize = size; size_t const rBufSize = size;
void* rBuf = malloc(rBufSize); void* rBuf = malloc(rBufSize);
size_t cBufSize = ZSTD_compressBound(size); size_t cBufSize = ZSTD_compressBound(size) * 2;
void *cBuf; void *cBuf;
/* Half of the time fuzz with a 1 byte smaller output size. /* Half of the time fuzz with a 1 byte smaller output size.
* This will still succeed because we force the checksum to be disabled, * This will still succeed because we force the checksum to be disabled,

2
tests/fuzz/simple_round_trip.c
View File

@ -48,7 +48,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *src, size_t size)
{ {
size_t const rBufSize = size; size_t const rBufSize = size;
void* rBuf = malloc(rBufSize); void* rBuf = malloc(rBufSize);
size_t cBufSize = ZSTD_compressBound(size); size_t cBufSize = ZSTD_compressBound(size) * 2;
void* cBuf; void* cBuf;
/* Give a random portion of src data to the producer, to use for /* Give a random portion of src data to the producer, to use for

3
tests/fuzz/zstd_helpers.c
View File

@ -96,6 +96,9 @@ void FUZZ_setRandomParameters(ZSTD_CCtx *cctx, size_t srcSize, FUZZ_dataProducer
if (FUZZ_dataProducer_uint32Range(producer, 0, 1) == 0) { if (FUZZ_dataProducer_uint32Range(producer, 0, 1) == 0) {
setRand(cctx, ZSTD_c_srcSizeHint, ZSTD_SRCSIZEHINT_MIN, 2 * srcSize, producer); setRand(cctx, ZSTD_c_srcSizeHint, ZSTD_SRCSIZEHINT_MIN, 2 * srcSize, producer);
} }
if (FUZZ_rand32(producer, 0, 1)) {
setRand(cctx, ZSTD_c_targetCBlockSize, ZSTD_TARGETCBLOCKSIZE_MIN, ZSTD_TARGETCBLOCKSIZE_MAX, producer);
}
} }
FUZZ_dict_t FUZZ_train(void const* src, size_t srcSize, FUZZ_dataProducer_t *producer) FUZZ_dict_t FUZZ_train(void const* src, size_t srcSize, FUZZ_dataProducer_t *producer)