removed ZSTD_compressBegin_targetSrcSize
This commit is contained in:
parent
c70c90e8a3
commit
4b3c5eed99
@ -2309,17 +2309,6 @@ size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* zc, const void* dict, size_t dict
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
size_t ZSTD_compressBegin_targetSrcSize(ZSTD_CCtx* zc, const void* dict, size_t dictSize, size_t targetSrcSize, int compressionLevel)
|
|
||||||
{
|
|
||||||
ZSTD_parameters params;
|
|
||||||
params.cParams = ZSTD_getCParams(compressionLevel, targetSrcSize, dictSize);
|
|
||||||
params.fParams.contentSizeFlag = 1;
|
|
||||||
ZSTD_adjustCParams(¶ms.cParams, targetSrcSize, dictSize);
|
|
||||||
ZSTD_LOG_BLOCK("%p: ZSTD_compressBegin_targetSrcSize compressionLevel=%d\n", zc->base, compressionLevel);
|
|
||||||
return ZSTD_compressBegin_internal(zc, dict, dictSize, params, targetSrcSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
size_t ZSTD_compressBegin(ZSTD_CCtx* zc, int compressionLevel)
|
size_t ZSTD_compressBegin(ZSTD_CCtx* zc, int compressionLevel)
|
||||||
{
|
{
|
||||||
ZSTD_LOG_BLOCK("%p: ZSTD_compressBegin compressionLevel=%d\n", zc->base, compressionLevel);
|
ZSTD_LOG_BLOCK("%p: ZSTD_compressBegin compressionLevel=%d\n", zc->base, compressionLevel);
|
||||||
|
@ -250,7 +250,6 @@ typedef struct {
|
|||||||
|
|
||||||
const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx);
|
const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx);
|
||||||
void ZSTD_seqToCodes(const seqStore_t* seqStorePtr, size_t const nbSeq);
|
void ZSTD_seqToCodes(const seqStore_t* seqStorePtr, size_t const nbSeq);
|
||||||
size_t ZSTD_compressBegin_targetSrcSize(ZSTD_CCtx* zc, const void* dict, size_t dictSize, size_t targetSrcSize, int compressionLevel);
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* ZSTD_CCOMMON_H_MODULE */
|
#endif /* ZSTD_CCOMMON_H_MODULE */
|
||||||
|
@ -86,7 +86,6 @@
|
|||||||
|
|
||||||
#include "mem.h"
|
#include "mem.h"
|
||||||
#include "zstd_static.h"
|
#include "zstd_static.h"
|
||||||
#include "zstd_internal.h" /* ZSTD_compressBegin_targetSrcSize */
|
|
||||||
#include "datagen.h" /* RDG_genBuffer */
|
#include "datagen.h" /* RDG_genBuffer */
|
||||||
#include "xxhash.h"
|
#include "xxhash.h"
|
||||||
|
|
||||||
@ -204,6 +203,19 @@ static U64 BMK_getFileSize(const char* infilename)
|
|||||||
return (U64)statbuf.st_size;
|
return (U64)statbuf.st_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static U32 BMK_isDirectory(const char* infilename)
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
struct _stat64 statbuf;
|
||||||
|
r = _stat64(infilename, &statbuf);
|
||||||
|
#else
|
||||||
|
struct stat statbuf;
|
||||||
|
r = stat(infilename, &statbuf);
|
||||||
|
#endif
|
||||||
|
if (!r && S_ISDIR(statbuf.st_mode)) return 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* ********************************************************
|
/* ********************************************************
|
||||||
* Bench functions
|
* Bench functions
|
||||||
@ -317,8 +329,13 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
|
|||||||
{ U32 nbLoops;
|
{ U32 nbLoops;
|
||||||
for (nbLoops = 0 ; BMK_clockSpan(clockStart, ticksPerSecond) < clockLoop ; nbLoops++) {
|
for (nbLoops = 0 ; BMK_clockSpan(clockStart, ticksPerSecond) < clockLoop ; nbLoops++) {
|
||||||
U32 blockNb;
|
U32 blockNb;
|
||||||
ZSTD_compressBegin_targetSrcSize(refCtx, dictBuffer, dictBufferSize, blockSize, cLevel);
|
{ ZSTD_parameters params;
|
||||||
// ZSTD_compressBegin_usingDict(refCtx, dictBuffer, dictBufferSize, cLevel);
|
params.cParams = ZSTD_getCParams(cLevel, blockSize, dictBufferSize);
|
||||||
|
params.fParams.contentSizeFlag = 1;
|
||||||
|
ZSTD_adjustCParams(¶ms.cParams, blockSize, dictBufferSize);
|
||||||
|
{ size_t const initResult = ZSTD_compressBegin_advanced(refCtx, dictBuffer, dictBufferSize, params, blockSize);
|
||||||
|
if (ZSTD_isError(initResult)) break;
|
||||||
|
} }
|
||||||
for (blockNb=0; blockNb<nbBlocks; blockNb++) {
|
for (blockNb=0; blockNb<nbBlocks; blockNb++) {
|
||||||
size_t const rSize = ZSTD_compress_usingPreparedCCtx(ctx, refCtx,
|
size_t const rSize = ZSTD_compress_usingPreparedCCtx(ctx, refCtx,
|
||||||
blockTable[blockNb].cPtr, blockTable[blockNb].cRoom,
|
blockTable[blockNb].cPtr, blockTable[blockNb].cRoom,
|
||||||
@ -504,14 +521,7 @@ static void BMK_loadFiles(void* buffer, size_t bufferSize,
|
|||||||
|
|
||||||
unsigned n;
|
unsigned n;
|
||||||
for (n=0; n<nbFiles; n++) {
|
for (n=0; n<nbFiles; n++) {
|
||||||
#if defined(_MSC_VER)
|
if (BMK_isDirectory(fileNamesTable[n])) {
|
||||||
struct _stat64 statbuf;
|
|
||||||
int r = _stat64(fileNamesTable[n], &statbuf);
|
|
||||||
#else
|
|
||||||
struct stat statbuf;
|
|
||||||
int r = stat(fileNamesTable[n], &statbuf);
|
|
||||||
#endif
|
|
||||||
if (!r && S_ISDIR(statbuf.st_mode)) {
|
|
||||||
DISPLAYLEVEL(2, "Ignoring %s directory... \n", fileNamesTable[n]);
|
DISPLAYLEVEL(2, "Ignoring %s directory... \n", fileNamesTable[n]);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user