From: inikep <inikep@gmail.com>
Date: Mon, 23 May 2016 13:49:09 +0000 (+0200)
Subject: added ZSTD_createCCtx_advanced
X-Git-Tag: v0.7.0^2~54^2^2~9^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50e82c015d56c00879bb8d2d551d117b840a9804;p=thirdparty%2Fzstd.git

added ZSTD_createCCtx_advanced
---

diff --git a/lib/common/zstd_static.h b/lib/common/zstd_static.h
index ef42b0a97..912eb1335 100644
--- a/lib/common/zstd_static.h
+++ b/lib/common/zstd_static.h
@@ -94,10 +94,19 @@ typedef struct {
     ZSTD_frameParameters fParams;
 } ZSTD_parameters;
 
+typedef void* (*ZSTD_allocFunction) (size_t size);
+typedef void  (*ZSTD_freeFunction) (void* address);
+typedef struct { ZSTD_allocFunction customAlloc; ZSTD_freeFunction customFree; } ZSTD_customMem;
+
 
 /*-*************************************
 *  Advanced functions
 ***************************************/
+/*! ZSTD_createCCtx_advanced() :
+ *  Create ZSTD context using external alloc and free functions */ 
+ZSTDLIB_API ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem);
+
+
 ZSTDLIB_API unsigned ZSTD_maxCLevel (void);
 
 /*! ZSTD_getCParams() :
diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 988a74fb7..00106f5fe 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -104,6 +104,8 @@ struct ZSTD_CCtx_s
     void* workSpace;
     size_t workSpaceSize;
     size_t blockSize;
+    ZSTD_allocFunction customAlloc;
+    ZSTD_freeFunction customFree;
 
     seqStore_t seqStore;    /* sequences storage ptrs */
     U32* hashTable;
@@ -118,13 +120,32 @@ struct ZSTD_CCtx_s
 
 ZSTD_CCtx* ZSTD_createCCtx(void)
 {
-    return (ZSTD_CCtx*) calloc(1, sizeof(ZSTD_CCtx));
+    ZSTD_CCtx* ctx = (ZSTD_CCtx*) calloc(1, sizeof(ZSTD_CCtx));
+    if (!ctx) return NULL;
+
+    ctx->customAlloc = malloc;
+    ctx->customFree = free;
+    return ctx;
+}
+
+ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
+{
+    if (!customMem.customAlloc || !customMem.customFree)
+        return ZSTD_createCCtx();
+
+    ZSTD_CCtx* ctx = (ZSTD_CCtx*) customMem.customAlloc(sizeof(ZSTD_CCtx));
+    if (!ctx) return NULL;
+
+    memset(ctx, 0, sizeof(ZSTD_CCtx));
+    ctx->customAlloc = customMem.customAlloc; 
+    ctx->customFree = customMem.customFree;
+    return ctx;
 }
 
 size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx)
 {
-    free(cctx->workSpace);
-    free(cctx);
+    cctx->customFree(cctx->workSpace);
+    cctx->customFree(cctx);
     return 0;   /* reserved as a potential error code in the future */
 }
 
@@ -229,8 +250,8 @@ static size_t ZSTD_resetCCtx_advanced (ZSTD_CCtx* zc,
         size_t const neededSpace = tableSpace + (256*sizeof(U32)) /* huffTable */ + tokenSpace
                               + ((params.cParams.strategy == ZSTD_btopt) ? optSpace : 0);
         if (zc->workSpaceSize < neededSpace) {
-            free(zc->workSpace);
-            zc->workSpace = malloc(neededSpace);
+            zc->customFree(zc->workSpace);
+            zc->workSpace = zc->customAlloc(neededSpace);
             if (zc->workSpace == NULL) return ERROR(memory_allocation);
             zc->workSpaceSize = neededSpace;
     }   }
@@ -2021,7 +2042,7 @@ static size_t ZSTD_compress_generic (ZSTD_CCtx* zc,
     BYTE* const ostart = (BYTE*)dst;
     BYTE* op = ostart;
     const U32 maxDist = 1 << zc->params.cParams.windowLog;
-    ZSTD_stats_t* stats = malloc(sizeof(ZSTD_stats_t));
+    ZSTD_stats_t* stats = (ZSTD_stats_t*) zc->customAlloc(sizeof(ZSTD_stats_t));
     if (!stats) return ERROR(memory_allocation);
     zc->seqStore.stats = stats;
     ZSTD_statsInit(stats);
@@ -2030,7 +2051,7 @@ static size_t ZSTD_compress_generic (ZSTD_CCtx* zc,
         size_t cSize;
         ZSTD_statsResetFreqs(stats);
 
-        if (dstCapacity < ZSTD_blockHeaderSize + MIN_CBLOCK_SIZE) return ERROR(dstSize_tooSmall);   /* not enough space to store compressed block */
+        if (dstCapacity < ZSTD_blockHeaderSize + MIN_CBLOCK_SIZE) { zc->customFree(stats); return ERROR(dstSize_tooSmall); }   /* not enough space to store compressed block */
         if (remaining < blockSize) blockSize = remaining;
 
         if ((U32)(ip+blockSize - zc->base) > zc->loadedDictEnd + maxDist) {
@@ -2041,11 +2062,11 @@ static size_t ZSTD_compress_generic (ZSTD_CCtx* zc,
         }
 
         cSize = ZSTD_compressBlock_internal(zc, op+ZSTD_blockHeaderSize, dstCapacity-ZSTD_blockHeaderSize, ip, blockSize);
-        if (ZSTD_isError(cSize)) return cSize;
+        if (ZSTD_isError(cSize)) { zc->customFree(stats); return cSize; }
 
         if (cSize == 0) {  /* block is not compressible */
             cSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize);
-            if (ZSTD_isError(cSize)) return cSize;
+            if (ZSTD_isError(cSize)) { zc->customFree(stats); return cSize; }
         } else {
             op[0] = (BYTE)(cSize>>16);
             op[1] = (BYTE)(cSize>>8);
@@ -2061,7 +2082,7 @@ static size_t ZSTD_compress_generic (ZSTD_CCtx* zc,
     }
 
     ZSTD_statsPrint(stats, zc->params.cParams.searchLength);
-    free(stats);
+    zc->customFree(stats);
     return op-ostart;
 }
 
@@ -2427,8 +2448,10 @@ size_t ZSTD_compress(void* dst, size_t dstCapacity, const void* src, size_t srcS
     size_t result;
     ZSTD_CCtx ctxBody;
     memset(&ctxBody, 0, sizeof(ctxBody));
+    ctxBody.customAlloc = malloc;
+    ctxBody.customFree = free;
     result = ZSTD_compressCCtx(&ctxBody, dst, dstCapacity, src, srcSize, compressionLevel);
-    free(ctxBody.workSpace);   /* can't free ctxBody, since it's on stack; just free heap content */
+    ctxBody.customFree(ctxBody.workSpace);   /* can't free ctxBody, since it's on stack; just free heap content */
     return result;
 }