ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor : createDictionaryBuffer() can create dictionaries of different sizes

Browse Source
This commit is contained in:
Yann Collet
2018-08-30 16:24:44 -07:00
parent 39c55a118f
commit f76253bb70
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/largeNbDicts/largeNbDicts.c
+16 -12
View File
@@ -131,25 +131,28 @@ static buffer_t createBuffer_fromFile(const char* fileName)
static buffer_t static buffer_t
createDictionaryBuffer(const char* dictionaryName, createDictionaryBuffer(const char* dictionaryName,
const void* srcBuffer, const void* srcBuffer,
const size_t* srcBlockSizes, unsigned nbBlocks) const size_t* srcBlockSizes, unsigned nbBlocks,
size_t requestedDictSize)
{ {
if (dictionaryName) { if (dictionaryName) {
DISPLAYLEVEL(3, "loading dictionary %s \n", dictionaryName); DISPLAYLEVEL(3, "loading dictionary %s \n", dictionaryName);
return createBuffer_fromFile(dictionaryName); return createBuffer_fromFile(dictionaryName);
} else {
DISPLAYLEVEL(3, "creating dictionary, of target size %u bytes \n", DICTSIZE);
void* const dictBuffer = malloc(DICTSIZE);
assert(dictBuffer != NULL);
size_t const dictSize = ZDICT_trainFromBuffer(dictBuffer, DICTSIZE, } else {
srcBuffer,
srcBlockSizes, DISPLAYLEVEL(3, "creating dictionary, of target size %u bytes \n",
nbBlocks); (unsigned)requestedDictSize);
assert(!ZSTD_isError(dictSize)); void* const dictBuffer = malloc(requestedDictSize);
CONTROL(dictBuffer != NULL);
size_t const dictSize = ZDICT_trainFromBuffer(dictBuffer, requestedDictSize,
srcBuffer,
srcBlockSizes, nbBlocks);
CONTROL(!ZSTD_isError(dictSize));
buffer_t result; buffer_t result;
result.ptr = dictBuffer; result.ptr = dictBuffer;
result.capacity = DICTSIZE; result.capacity = requestedDictSize;
result.size = dictSize; result.size = dictSize;
return result; return result;
} }
@@ -616,7 +619,8 @@ int bench(const char** fileNameTable, unsigned nbFiles,
/* dictionary determination */ /* dictionary determination */
buffer_t const dictBuffer = createDictionaryBuffer(dictionary, buffer_t const dictBuffer = createDictionaryBuffer(dictionary,
srcBuffer.ptr, srcBuffer.ptr,
srcSlices.capacities, nbBlocks); srcSlices.capacities, nbBlocks,
DICTSIZE);
CONTROL(dictBuffer.ptr != NULL); CONTROL(dictBuffer.ptr != NULL);
ZSTD_CDict* const cdict = ZSTD_createCDict(dictBuffer.ptr, dictBuffer.size, clevel); ZSTD_CDict* const cdict = ZSTD_createCDict(dictBuffer.ptr, dictBuffer.size, clevel);