facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed complex tsan issue

Browse Source 
when job->consumed == job->src.size , compression job is presumed completed,
so it must be the very last action done in worker thread.
This commit is contained in:
Yann Collet 2018-09-20 13:47:31 -07:00
parent 15519479ba
commit 7992942d66
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/compress/zstdmt_compress.c
View File

@ -640,6 +640,7 @@ void ZSTDMT_compressionJob(void* jobDescription)
ZSTD_CCtx* const cctx = ZSTDMT_getCCtx(job->cctxPool); ZSTD_CCtx* const cctx = ZSTDMT_getCCtx(job->cctxPool);
rawSeqStore_t rawSeqStore = ZSTDMT_getSeq(job->seqPool); rawSeqStore_t rawSeqStore = ZSTDMT_getSeq(job->seqPool);
buffer_t dstBuff = job->dstBuff; buffer_t dstBuff = job->dstBuff;
size_t lastCBlockSize = 0;
/* ressources */ /* ressources */
if (cctx==NULL) { if (cctx==NULL) {
@ -739,11 +740,7 @@ void ZSTDMT_compressionJob(void* jobDescription)
ZSTD_compressEnd (cctx, op, oend-op, ip, lastBlockSize) : ZSTD_compressEnd (cctx, op, oend-op, ip, lastBlockSize) :
ZSTD_compressContinue(cctx, op, oend-op, ip, lastBlockSize); ZSTD_compressContinue(cctx, op, oend-op, ip, lastBlockSize);
if (ZSTD_isError(cSize)) { job->cSize = cSize; goto _endJob; } if (ZSTD_isError(cSize)) { job->cSize = cSize; goto _endJob; }
/* stats */ lastCBlockSize = cSize;
ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);
job->cSize += cSize;
job->consumed = job->src.size;
ZSTD_pthread_mutex_unlock(&job->job_mutex);
} } } }
_endJob: _endJob:
@ -755,7 +752,12 @@ _endJob:
ZSTDMT_releaseSeq(job->seqPool, rawSeqStore); ZSTDMT_releaseSeq(job->seqPool, rawSeqStore);
ZSTDMT_releaseCCtx(job->cctxPool, cctx); ZSTDMT_releaseCCtx(job->cctxPool, cctx);
/* report */ /* report */
ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);
if (ZSTD_isError(job->cSize)) assert(lastCBlockSize == 0);
job->cSize += lastCBlockSize;
job->consumed = job->src.size; /* when job->consumed == job->src.size , compression job is presumed completed */
ZSTD_pthread_cond_signal(&job->job_cond); ZSTD_pthread_cond_signal(&job->job_cond);
ZSTD_pthread_mutex_unlock(&job->job_mutex);
} }