lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

break loadFile_orDie() into 2: loadFile_orDie() loads file into a pre-allocated memory buffer, mallocAndLoadFile_orDie() allocates memory first, then calls loadFile_orDie()

Browse Source
This commit is contained in:
Yi Jin
2018-12-17 16:54:55 -08:00
parent 452689678b
commit bc4dc606de
6 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/multiple_simple_compression.c
View File

@ -26,9 +26,9 @@ typedef struct {
/*
* allocate memory for buffers big enough to compress all files
* as well as memory for output file name (outFilename)
* as well as memory for output file name (ofn)
*/
static resources createResources_orDie(int argc, const char** argv, char **outFilename)
static resources createResources_orDie(int argc, const char** argv, char **ofn, int* ofnBufferLen)
{
size_t maxFilenameLength=0;
size_t maxFileSize = 0;
@ -47,7 +47,8 @@ static resources createResources_orDie(int argc, const char** argv, char **outFi
ress.fBufferSize = maxFileSize;
ress.cBufferSize = ZSTD_compressBound(maxFileSize);
*outFilename = (char*)malloc_orDie(maxFilenameLength + 5);
*ofnBufferLen = maxFilenameLength + 5;
*ofn = (char*)malloc_orDie(*ofnBufferLen);
ress.fBuffer = malloc_orDie(ress.fBufferSize);
ress.cBuffer = malloc_orDie(ress.cBufferSize);
ress.cctx = ZSTD_createCCtx();
@ -66,8 +67,7 @@ static void freeResources(resources ress, char *outFilename)
/* compress with pre-allocated context (ZSTD_CCtx) and input/output buffers*/
static void compressFile_orDie(resources ress, const char* fname, const char* oname)
{
size_t fSize;
loadFile_orDie(fname, &fSize, ress.fBuffer, ress.fBufferSize);
size_t fSize = loadFile_orDie(fname, ress.fBuffer, ress.fBufferSize);
size_t const cSize = ZSTD_compressCCtx(ress.cctx, ress.cBuffer, ress.cBufferSize, ress.fBuffer, fSize, 1);
if (ZSTD_isError(cSize)) {
@ -94,15 +94,17 @@ int main(int argc, const char** argv)
/* memory allocation for outFilename and resources */
char* outFilename;
resources ress = createResources_orDie(argc, argv, &outFilename);
int outFilenameBufferLen;
resources const ress = createResources_orDie(argc, argv, &outFilename, &outFilenameBufferLen);
/* compress files with shared context, input and output buffers */
int argNb;
for (argNb = 1; argNb < argc; argNb++) {
const char* const inFilename = argv[argNb];
memset(outFilename, 0, 1);
strcat(outFilename, inFilename);
strcat(outFilename, ".zst");
int inFilenameLen = strlen(inFilename);
assert(inFilenameLen + 5 <= outFilenameBufferLen);
memcpy(outFilename, inFilename, inFilenameLen);
memcpy(outFilename+inFilenameLen, ".zst", 5);
compressFile_orDie(ress, inFilename, outFilename);
}