sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-10-09 00:05:28 -04:00
Code Issues Projects Releases Wiki Activity

Support advanced API so forceCopy/forceAttach works properly

Browse Source
This commit is contained in:
Elliot Gorokhovsky 2022-06-14 14:52:51 -07:00
parent e0c4863c5c
commit f7ebbcd0cc
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/largeNbDicts/largeNbDicts.c
View File

@ -577,11 +577,12 @@ typedef struct {
cdict_collection_t dictionaries; cdict_collection_t dictionaries;
} compressInstructions; } compressInstructions;
compressInstructions createCompressInstructions(cdict_collection_t dictionaries) compressInstructions createCompressInstructions(cdict_collection_t dictionaries, ZSTD_CCtx_params* cctxParams)
{ {
compressInstructions ci; compressInstructions ci;
ci.cctx = ZSTD_createCCtx(); ci.cctx = ZSTD_createCCtx();
CONTROL(ci.cctx != NULL); CONTROL(ci.cctx != NULL);
ZSTD_CCtx_setParametersUsingCCtxParams(ci.cctx, cctxParams);
ci.nbDicts = dictionaries.nbCDict; ci.nbDicts = dictionaries.nbCDict;
ci.dictNb = 0; ci.dictNb = 0;
ci.dictionaries = dictionaries; ci.dictionaries = dictionaries;
@ -622,10 +623,10 @@ size_t compress(const void* src, size_t srcSize, void* dst, size_t dstCapacity,
compressInstructions* const ci = (compressInstructions*) payload; compressInstructions* const ci = (compressInstructions*) payload;
(void)dstCapacity; (void)dstCapacity;
ZSTD_compress_usingCDict(ci->cctx, ZSTD_CCtx_refCDict(ci->cctx, ci->dictionaries.cdicts[ci->dictNb]);
ZSTD_compress2(ci->cctx,
dst, srcSize, dst, srcSize,
src, srcSize, src, srcSize);
ci->dictionaries.cdicts[ci->dictNb]);
ci->dictNb = ci->dictNb + 1; ci->dictNb = ci->dictNb + 1;
if (ci->dictNb >= ci->nbDicts) ci->dictNb = 0; if (ci->dictNb >= ci->nbDicts) ci->dictNb = 0;
@ -655,9 +656,10 @@ static int benchMem(slice_collection_t dstBlocks,
ddict_collection_t ddictionaries, ddict_collection_t ddictionaries,
cdict_collection_t cdictionaries, cdict_collection_t cdictionaries,
unsigned nbRounds, int benchCompression, unsigned nbRounds, int benchCompression,
const char* exeName) const char* exeName, ZSTD_CCtx_params* cctxParams)
{ {
assert(dstBlocks.nbSlices == srcBlocks.nbSlices); assert(dstBlocks.nbSlices == srcBlocks.nbSlices);
if (benchCompression) assert(cctxParams);
unsigned const ms_per_round = RUN_TIME_DEFAULT_MS; unsigned const ms_per_round = RUN_TIME_DEFAULT_MS;
unsigned const total_time_ms = nbRounds * ms_per_round; unsigned const total_time_ms = nbRounds * ms_per_round;
@ -668,7 +670,7 @@ static int benchMem(slice_collection_t dstBlocks,
BMK_createTimedFnState(total_time_ms, ms_per_round); BMK_createTimedFnState(total_time_ms, ms_per_round);
decompressInstructions di = createDecompressInstructions(ddictionaries); decompressInstructions di = createDecompressInstructions(ddictionaries);
compressInstructions ci = createCompressInstructions(cdictionaries); compressInstructions ci = createCompressInstructions(cdictionaries, cctxParams);
void* payload = benchCompression ? (void*)&ci : (void*)&di; void* payload = benchCompression ? (void*)&ci : (void*)&di;
BMK_benchParams_t const bp = { BMK_benchParams_t const bp = {
.benchFn = benchCompression ? compress : decompress, .benchFn = benchCompression ? compress : decompress,
@ -834,7 +836,7 @@ int bench(const char** fileNameTable, unsigned nbFiles,
buffer_collection_t resultCollection = createBufferCollection_fromSliceCollection(srcSlices); buffer_collection_t resultCollection = createBufferCollection_fromSliceCollection(srcSlices);
CONTROL(resultCollection.buffer.ptr != NULL); CONTROL(resultCollection.buffer.ptr != NULL);
result = benchMem(dstSlices, resultCollection.slices, ddictionaries, cdictionaries, nbRounds, benchCompression, exeName); result = benchMem(dstSlices, resultCollection.slices, ddictionaries, cdictionaries, nbRounds, benchCompression, exeName, cctxParams);
freeBufferCollection(resultCollection); freeBufferCollection(resultCollection);
} else { } else {
@ -848,7 +850,7 @@ int bench(const char** fileNameTable, unsigned nbFiles,
buffer_collection_t resultCollection = createBufferCollection_fromSliceCollectionSizes(srcSlices); buffer_collection_t resultCollection = createBufferCollection_fromSliceCollectionSizes(srcSlices);
CONTROL(resultCollection.buffer.ptr != NULL); CONTROL(resultCollection.buffer.ptr != NULL);
result = benchMem(resultCollection.slices, dstSlices, ddictionaries, cdictionaries, nbRounds, benchCompression, exeName); result = benchMem(resultCollection.slices, dstSlices, ddictionaries, cdictionaries, nbRounds, benchCompression, exeName, NULL);
freeBufferCollection(resultCollection); freeBufferCollection(resultCollection);
} }