Move dictContentByRef to cctx params

diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h
index b1cbd05a741b36289e45755a5347894f755094f8..f7359646e11cc3b455d7fd958d66407555d990c2 100644 (file)
--- a/lib/common/zstd_internal.h
+++ b/lib/common/zstd_internal.h
@@ -224,9 +224,14 @@ typedef struct seqDef_s {
 typedef struct ZSTD_CCtx_params_s {
     ZSTD_compressionParameters cParams;
     ZSTD_frameParameters fParams;
+
     int compressionLevel;
     U32 forceWindow;
+
+    /* Dictionary */
     ZSTD_dictMode_e dictMode;
+    U32 dictContentByRef;
+
 
 } ZSTD_CCtx_params;
 

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index ada9d4f5783830ef804d0edc6fd7899916589c2b..7802df507837c051f579b0db207be1654fa1a75e 100644 (file)
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -117,7 +117,7 @@ struct ZSTD_CCtx_s {
 
     /* Dictionary */
 //    ZSTD_dictMode_e dictMode; /* select restricting dictionary to "rawContent" or "fullDict" only */
-    U32 dictContentByRef;
+//    U32 dictContentByRef;
     ZSTD_CDict* cdictLocal;
     const ZSTD_CDict* cdict;
     const void* prefix;
@@ -418,7 +418,7 @@ size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, unsigned v
     case ZSTD_p_refDictContent :
         if (cctx->cdict) return ERROR(stage_wrong);  /* must be set before loading */
         /* dictionary content will be referenced, instead of copied */
-        cctx->dictContentByRef = value>0;
+        cctx->requestedParams.dictContentByRef = value>0;
         return 0;
 
     case ZSTD_p_forceMaxWindow :  /* Force back-references to remain < windowSize,
@@ -541,7 +541,7 @@ size_t ZSTD_CCtxParam_setParameter(
         return 0;
 
     case ZSTD_p_refDictContent :
-//        cctx->dictContentByRef = value > 0;
+        params->dictContentByRef = value > 0;
         return 0;
 
     case ZSTD_p_forceMaxWindow :
@@ -549,12 +549,15 @@ size_t ZSTD_CCtxParam_setParameter(
         return 0;
 
     case ZSTD_p_nbThreads :
+        // TODO
         return 0;
 
     case ZSTD_p_jobSize :
+        // TODO
         return 0;
 
     case ZSTD_p_overlapSizeLog :
+        // TODO
         return 0;
 
     default: return ERROR(parameter_unsupported);
@@ -592,7 +595,8 @@ ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, s
                 ZSTD_getCParams(cctx->requestedParams.compressionLevel, 0, dictSize);
         cctx->cdictLocal = ZSTD_createCDict_advanced(
                                 dict, dictSize,
-                                cctx->dictContentByRef, cctx->requestedParams.dictMode,
+                                cctx->requestedParams.dictContentByRef,
+                                cctx->requestedParams.dictMode,
                                 cParams, cctx->customMem);
         cctx->cdict = cctx->cdictLocal;
         if (cctx->cdictLocal == NULL)
@@ -3594,14 +3598,14 @@ size_t ZSTD_compress(void* dst, size_t dstCapacity, const void* src, size_t srcS
 /* =====  Dictionary API  ===== */
 
 size_t ZSTD_estimateCDictSize_advanced_opaque(
-        size_t dictSize, ZSTD_CCtx_params* params, unsigned byReference)
+        size_t dictSize, ZSTD_CCtx_params* params)
 {
     if (params == NULL) { return 0; }
     DEBUGLOG(5, "sizeof(ZSTD_CDict) : %u", (U32)sizeof(ZSTD_CDict));
     DEBUGLOG(5, "CCtx estimate : %u",
              (U32)ZSTD_estimateCCtxSize_advanced_opaque(params));
     return sizeof(ZSTD_CDict) + ZSTD_estimateCCtxSize_advanced_opaque(params)
-           + (byReference ? 0 : dictSize);
+           + (params->dictContentByRef ? 0 : dictSize);
 
 }
 
@@ -3610,7 +3614,8 @@ size_t ZSTD_estimateCDictSize_advanced_opaque(
 size_t ZSTD_estimateCDictSize_advanced(size_t dictSize, ZSTD_compressionParameters cParams, unsigned byReference)
 {
     ZSTD_CCtx_params params = ZSTD_makeCCtxParamsFromCParams(cParams);
-    return ZSTD_estimateCDictSize_advanced_opaque(dictSize, &params, byReference);
+    params.dictContentByRef = byReference;
+    return ZSTD_estimateCDictSize_advanced_opaque(dictSize, &params);
 }
 
 size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel)
@@ -3662,6 +3667,8 @@ static size_t ZSTD_initCDict_internal(
         cctxParams.cParams = cParams;
         cctxParams.fParams = fParams;
         cctxParams.dictMode = dictMode;
+        cctxParams.dictContentByRef = byReference;
+
         CHECK_F( ZSTD_compressBegin_internal(cdict->refContext,
                                         cdict->dictContent, dictSize,
                                         NULL,
@@ -3730,12 +3737,12 @@ size_t ZSTD_freeCDict(ZSTD_CDict* cdict)
 
 ZSTD_CDict* ZSTD_initStaticCDict_advanced_opaque(
         void *workspace, size_t workspaceSize, const void* dict,
-        size_t dictSize, unsigned byReference,
+        size_t dictSize,
         ZSTD_CCtx_params* params)
 {
     ZSTD_compressionParameters cParams = params->cParams;
     size_t const cctxSize = ZSTD_estimateCCtxSize_advanced(cParams);
-    size_t const neededSize = sizeof(ZSTD_CDict) + (byReference ? 0 : dictSize)
+    size_t const neededSize = sizeof(ZSTD_CDict) + (params->dictContentByRef ? 0 : dictSize)
                             + cctxSize;
     ZSTD_CDict* const cdict = (ZSTD_CDict*) workspace;
     void* ptr;
@@ -3745,7 +3752,7 @@ ZSTD_CDict* ZSTD_initStaticCDict_advanced_opaque(
         (U32)workspaceSize, (U32)neededSize, (U32)(workspaceSize < neededSize));
     if (workspaceSize < neededSize) return NULL;
 
-    if (!byReference) {
+    if (!params->dictContentByRef) {
         memcpy(cdict+1, dict, dictSize);
         dict = cdict+1;
         ptr = (char*)workspace + sizeof(ZSTD_CDict) + dictSize;
@@ -3783,12 +3790,12 @@ ZSTD_CDict* ZSTD_initStaticCDict(void* workspace, size_t workspaceSize,
 {
     ZSTD_CCtx_params params = ZSTD_makeCCtxParamsFromCParams(cParams);
     params.dictMode = dictMode;
+    params.dictContentByRef = byReference;
     return ZSTD_initStaticCDict_advanced_opaque(
             workspace, workspaceSize, dict, dictSize,
-            byReference, &params);
+            &params);
 }
 
-
 ZSTD_parameters ZSTD_getParamsFromCDict(const ZSTD_CDict* cdict) {
     return ZSTD_getParamsFromCCtx(cdict->refContext);
 }
@@ -3946,7 +3953,7 @@ size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
         }
         ZSTD_freeCDict(zcs->cdictLocal);
         zcs->cdictLocal = ZSTD_createCDict_advanced(dict, dictSize,
-                                            zcs->dictContentByRef,
+                                            zcs->requestedParams.dictContentByRef,
                                             zcs->requestedParams.dictMode,
                                             params.cParams, zcs->customMem);
         zcs->cdict = zcs->cdictLocal;

diff --git a/lib/zstd.h b/lib/zstd.h
index be3d7c4cce66508b663cd313b3af8f930685e7fb..56316160aaed52b3e96310b1b9fd92ab2f479851 100644 (file)
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@ -528,7 +528,9 @@ ZSTDLIB_API size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t sr
  *  Note : dictionary created "byReference" are smaller */
 ZSTDLIB_API size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel);
 ZSTDLIB_API size_t ZSTD_estimateCDictSize_advanced(size_t dictSize, ZSTD_compressionParameters cParams, unsigned byReference);
-ZSTDLIB_API size_t ZSTD_estimateCDictSize_advanced_opaque(size_t dictSize, ZSTD_CCtx_params* params, unsigned byReference);
+
+// By reference
+ZSTDLIB_API size_t ZSTD_estimateCDictSize_advanced_opaque(size_t dictSize, ZSTD_CCtx_params* params);
 ZSTDLIB_API size_t ZSTD_estimateDDictSize(size_t dictSize, unsigned byReference);
 
 
@@ -608,7 +610,6 @@ ZSTDLIB_API ZSTD_CDict* ZSTD_initStaticCDict(
 ZSTDLIB_API ZSTD_CDict* ZSTD_initStaticCDict_advanced_opaque(
                             void* workspace, size_t workspaceSize,
                       const void* dict, size_t dictSize,
-                            unsigned byReference,
                             ZSTD_CCtx_params* params);
 
 ZSTDLIB_API ZSTD_CCtx_params* ZSTD_createCCtxParams(void);