From: Yann Collet <Cyan4973@users.noreply.github.com>
Date: Fri, 1 Sep 2017 01:08:37 +0000 (-0700)
Subject: Merge branch 'longRangeMatcher' into dev
X-Git-Tag: fuzz-corpora2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F827%2Fhead;p=thirdparty%2Fzstd.git

Merge branch 'longRangeMatcher' into dev
---

d7ad99b2ab7f89ef7e651074adf234e294385c8e
diff --cc lib/compress/zstdmt_compress.c
index 84a568890,166f99d72..93d4a3cec
--- a/lib/compress/zstdmt_compress.c
+++ b/lib/compress/zstdmt_compress.c
@@@ -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);