From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Fri, 18 Nov 2016 10:46:30 +0000 (+0100)
Subject: bench.c without dict uses ZSTD_compressCCtx
X-Git-Tag: v1.1.2~74^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2558b4cdbc1a6ecae0f7a33ebea7260487b7916d;p=thirdparty%2Fzstd.git

bench.c without dict uses ZSTD_compressCCtx
---

diff --git a/.gitignore b/.gitignore
index 220a1e0eb..6f792e615 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ _zstdbench/
 .DS_Store
 googletest/
 *.d
+
+build/VS2010/zwrapbench/zwrapbench.vcxproj
\ No newline at end of file
diff --git a/programs/bench.c b/programs/bench.c
index 7b6e25206..df68d0ada 100644
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -213,11 +213,18 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                 if (cdict==NULL) EXM_THROW(1, "ZSTD_createCDict_advanced() allocation failure");
                 do {
                     U32 blockNb;
+                    size_t rSize;
                     for (blockNb=0; blockNb<nbBlocks; blockNb++) {
-                        size_t const rSize = ZSTD_compress_usingCDict(ctx,
+                        if (dictBufferSize) {
+                            rSize = ZSTD_compress_usingCDict(ctx,
                                             blockTable[blockNb].cPtr,  blockTable[blockNb].cRoom,
                                             blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize,
                                             cdict);
+                        } else {
+                            rSize = ZSTD_compressCCtx (ctx,
+                                            blockTable[blockNb].cPtr,  blockTable[blockNb].cRoom,
+                                            blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize, cLevel);
+                        }
                         if (ZSTD_isError(rSize)) EXM_THROW(1, "ZSTD_compress_usingCDict() failed : %s", ZSTD_getErrorName(rSize));
                         blockTable[blockNb].cSize = rSize;
                     }