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

minor : ZSTDMT_writeLastEmptyBlock() is a void function

Browse Source 
because it cannot fail
This commit is contained in:
Yann Collet 2018-01-26 11:06:34 -08:00
parent fca13c6855
commit d2b62b6fa5
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/compress/zstdmt_compress.c
View File

@ -142,6 +142,10 @@ static size_t ZSTDMT_sizeof_bufferPool(ZSTDMT_bufferPool* bufPool)
return poolSize + totalBufferSize; return poolSize + totalBufferSize;
} }
/* ZSTDMT_setBufferSize() :
* all future buffers provided by this buffer pool will have _at least_ this size
* note : it's better for all buffers to have same size,
* as they become freely interchangeable, reducing malloc/free usages and memory fragmentation */
static void ZSTDMT_setBufferSize(ZSTDMT_bufferPool* const bufPool, size_t const bSize) static void ZSTDMT_setBufferSize(ZSTDMT_bufferPool* const bufPool, size_t const bSize)
{ {
ZSTD_pthread_mutex_lock(&bufPool->poolMutex); ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
@ -992,12 +996,11 @@ size_t ZSTDMT_initCStream(ZSTDMT_CCtx* mtctx, int compressionLevel) {
/* ZSTDMT_writeLastEmptyBlock() /* ZSTDMT_writeLastEmptyBlock()
* Write a single empty block with an end-of-frame * Write a single empty block with an end-of-frame to finish a frame.
* to finish a frame. * Job must be created from streaming variant.
* Completed synchronously. * This function is always successfull if expected conditions are fulfilled.
* @return : 0, or an error code (can fail due to memory allocation)
*/ */
static size_t ZSTDMT_writeLastEmptyBlock(ZSTDMT_jobDescription* job) static void ZSTDMT_writeLastEmptyBlock(ZSTDMT_jobDescription* job)
{ {
assert(job->lastChunk == 1); assert(job->lastChunk == 1);
assert(job->srcSize == 0); /* last chunk is empty -> will be simplified into a last empty block */ assert(job->srcSize == 0); /* last chunk is empty -> will be simplified into a last empty block */
@ -1006,15 +1009,14 @@ static size_t ZSTDMT_writeLastEmptyBlock(ZSTDMT_jobDescription* job)
* It summons a dstBuffer itself, compresses into it, then releases srcBuffer, and gives result to mtctx. * It summons a dstBuffer itself, compresses into it, then releases srcBuffer, and gives result to mtctx.
* When done, srcBuffer is empty, while dstBuffer is filled, and will be released by mtctx. * When done, srcBuffer is empty, while dstBuffer is filled, and will be released by mtctx.
* This shortcut will simply switch srcBuffer for dstBuffer, providing same outcome as a normal job */ * This shortcut will simply switch srcBuffer for dstBuffer, providing same outcome as a normal job */
assert(job->dstBuff.start == NULL); /* invoked from streaming variant only (otherwise, dstBuff might be user's output) */ assert(job->dstBuff.start == NULL); /* invoked from streaming variant only (otherwise, dstBuff might be user's output) */
assert(job->srcBuff.start != NULL); /* invoked from streaming variant only (otherwise, srcBuff might be user's input) */ assert(job->srcBuff.start != NULL); /* invoked from streaming variant only (otherwise, srcBuff might be user's input) */
assert(job->srcBuff.size >= ZSTD_blockHeaderSize); assert(job->srcBuff.size >= ZSTD_blockHeaderSize); /* no buffer should ever be that small */
job->dstBuff = job->srcBuff; job->dstBuff = job->srcBuff;
job->srcBuff = g_nullBuffer; job->srcBuff = g_nullBuffer;
job->cSize = ZSTD_writeLastEmptyBlock(job->dstBuff.start, job->dstBuff.size); job->cSize = ZSTD_writeLastEmptyBlock(job->dstBuff.start, job->dstBuff.size);
assert(!ZSTD_isError(job->cSize)); assert(!ZSTD_isError(job->cSize));
assert(job->consumed == 0); assert(job->consumed == 0);
return 0;
} }
static size_t ZSTDMT_createCompressionJob(ZSTDMT_CCtx* mtctx, size_t srcSize, ZSTD_EndDirective endOp) static size_t ZSTDMT_createCompressionJob(ZSTDMT_CCtx* mtctx, size_t srcSize, ZSTD_EndDirective endOp)
@ -1031,6 +1033,7 @@ static size_t ZSTDMT_createCompressionJob(ZSTDMT_CCtx* mtctx, size_t srcSize, ZS
if (!mtctx->jobReady) { if (!mtctx->jobReady) {
DEBUGLOG(5, "ZSTDMT_createCompressionJob: preparing job %u to compress %u bytes with %u preload ", DEBUGLOG(5, "ZSTDMT_createCompressionJob: preparing job %u to compress %u bytes with %u preload ",
mtctx->nextJobID, (U32)srcSize, (U32)mtctx->prefixSize); mtctx->nextJobID, (U32)srcSize, (U32)mtctx->prefixSize);
assert(mtctx->jobs[jobID].srcBuff.start == NULL); /* no buffer left : supposed already released */
mtctx->jobs[jobID].srcBuff = mtctx->inBuff.buffer; mtctx->jobs[jobID].srcBuff = mtctx->inBuff.buffer;
mtctx->jobs[jobID].prefixStart = mtctx->inBuff.buffer.start; mtctx->jobs[jobID].prefixStart = mtctx->inBuff.buffer.start;
mtctx->jobs[jobID].prefixSize = mtctx->prefixSize; mtctx->jobs[jobID].prefixSize = mtctx->prefixSize;
@ -1085,7 +1088,7 @@ static size_t ZSTDMT_createCompressionJob(ZSTDMT_CCtx* mtctx, size_t srcSize, ZS
if ( (srcSize == 0) if ( (srcSize == 0)
&& (mtctx->nextJobID>0)/*single chunk must also write frame header*/ ) { && (mtctx->nextJobID>0)/*single chunk must also write frame header*/ ) {
assert(endOp == ZSTD_e_end); /* only possible case : need to end the frame with an empty last block */ assert(endOp == ZSTD_e_end); /* only possible case : need to end the frame with an empty last block */
CHECK_F( ZSTDMT_writeLastEmptyBlock(mtctx->jobs + jobID) ); ZSTDMT_writeLastEmptyBlock(mtctx->jobs + jobID);
mtctx->nextJobID++; mtctx->nextJobID++;
return 0; return 0;
} }
@ -1162,10 +1165,11 @@ static size_t ZSTDMT_flushProduced(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output, u
output->pos += toWrite; output->pos += toWrite;
job.dstFlushed += toWrite; job.dstFlushed += toWrite;
if ( (job.consumed == job.srcSize) if ( (job.consumed == job.srcSize) /* job completed */
&& (job.dstFlushed == job.cSize) ) { /* output buffer fully flushed => move to next one */ && (job.dstFlushed == job.cSize) ) { /* output buffer fully flushed => free this job position */
DEBUGLOG(5, "Job %u completed (%u bytes), moving to next one", DEBUGLOG(5, "Job %u completed (%u bytes), moving to next one",
mtctx->doneJobID, (U32)job.dstFlushed); mtctx->doneJobID, (U32)job.dstFlushed);
assert(job.srcBuff.start == NULL); /* srcBuff supposed already released */
ZSTDMT_releaseBuffer(mtctx->bufPool, job.dstBuff); ZSTDMT_releaseBuffer(mtctx->bufPool, job.dstBuff);
mtctx->jobs[wJobID].dstBuff = g_nullBuffer; mtctx->jobs[wJobID].dstBuff = g_nullBuffer;
mtctx->consumed += job.srcSize; mtctx->consumed += job.srcSize;