]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'longRangeMatcher' into dev 827/head
authorYann Collet <Cyan4973@users.noreply.github.com>
Fri, 1 Sep 2017 01:08:37 +0000 (18:08 -0700)
committerGitHub <noreply@github.com>
Fri, 1 Sep 2017 01:08:37 +0000 (18:08 -0700)
13 files changed:
1  2 
lib/common/zstd_internal.h
lib/compress/zstd_compress.c
lib/compress/zstdmt_compress.c
lib/compress/zstdmt_compress.h
lib/decompress/zstd_decompress.c
lib/zstd.h
programs/bench.c
tests/Makefile
tests/fuzzer.c
tests/paramgrill.c
tests/roundTripCrash.c
tests/zstreamtest.c
zlibWrapper/examples/zwrapbench.c

Simple merge
Simple merge
index 84a56889018a751f6214a3d81bd280ce46208ca6,166f99d72192bb6d82e1dd8149fa28ad875f02c3..93d4a3cec162b0bcc3ae69a6d2f9c32b1c3d61eb
@@@ -421,12 -444,10 +444,12 @@@ ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced
  
      mtctx = (ZSTDMT_CCtx*) ZSTD_calloc(sizeof(ZSTDMT_CCtx), cMem);
      if (!mtctx) return NULL;
+     ZSTDMT_initializeCCtxParameters(&mtctx->params, nbThreads);
      mtctx->cMem = cMem;
-     mtctx->nbThreads = nbThreads;
      mtctx->allJobsCompleted = 1;
 -    mtctx->factory = POOL_create(nbThreads, 1);
 +    mtctx->sectionSize = 0;
 +    mtctx->overlapLog = ZSTDMT_OVERLAPLOG_DEFAULT;
 +    mtctx->factory = POOL_create_advanced(nbThreads, 0, cMem);
      mtctx->jobs = ZSTDMT_allocJobsTable(&nbJobs, cMem);
      mtctx->jobIDMask = nbJobs - 1;
      mtctx->bufPool = ZSTDMT_createBufferPool(nbThreads, cMem);
Simple merge
Simple merge
diff --cc lib/zstd.h
Simple merge
Simple merge
diff --cc tests/Makefile
Simple merge
diff --cc tests/fuzzer.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge