ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added bounding to compression level change

Browse Source
This commit is contained in:
Paul Cruz
2017-07-21 09:30:24 -07:00
parent e929d3b787
commit 721c6a8b97
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/adaptive-compression/adapt.c
+6 -3
View File
@@ -323,20 +323,23 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
if (1 - createCompletion > threshold) { if (1 - createCompletion > threshold) {
/* job creation was not finished, compression thread waited */ /* job creation was not finished, compression thread waited */
unsigned const change = MAX_COMPRESSION_LEVEL_CHANGE - createCompletion * MAX_COMPRESSION_LEVEL_CHANGE; unsigned const change = MAX_COMPRESSION_LEVEL_CHANGE - createCompletion * MAX_COMPRESSION_LEVEL_CHANGE;
unsigned const boundChange = MIN(change, ZSTD_maxCLevel() - ctx->compressionLevel);
DEBUG(2, "increasing compression level %u by %u\n", ctx->compressionLevel, change); DEBUG(2, "increasing compression level %u by %u\n", ctx->compressionLevel, change);
ctx->compressionLevel += change; ctx->compressionLevel += boundChange;
} }
else if (1 - writeCompletion > threshold) { else if (1 - writeCompletion > threshold) {
/* write thread was not finished, compression thread waited */ /* write thread was not finished, compression thread waited */
unsigned const change = MAX_COMPRESSION_LEVEL_CHANGE - writeCompletion * MAX_COMPRESSION_LEVEL_CHANGE; unsigned const change = MAX_COMPRESSION_LEVEL_CHANGE - writeCompletion * MAX_COMPRESSION_LEVEL_CHANGE;
unsigned const boundChange = MIN(change, ZSTD_maxCLevel() - ctx->compressionLevel);
DEBUG(2, "increasing compression level %u by %u\n", ctx->compressionLevel, change); DEBUG(2, "increasing compression level %u by %u\n", ctx->compressionLevel, change);
ctx->compressionLevel += change; ctx->compressionLevel += boundChange;
} }
else if (1 - compressionCompletion > threshold) { else if (1 - compressionCompletion > threshold) {
/* compression thread was not finished, one of the other two threads waited */ /* compression thread was not finished, one of the other two threads waited */
unsigned const change = MAX_COMPRESSION_LEVEL_CHANGE - compressionCompletion * MAX_COMPRESSION_LEVEL_CHANGE; unsigned const change = MAX_COMPRESSION_LEVEL_CHANGE - compressionCompletion * MAX_COMPRESSION_LEVEL_CHANGE;
unsigned const boundChange = MIN(change, ctx->compressionLevel - 1);
DEBUG(2, "decreasing compression level %u by %u\n", ctx->compressionLevel, change); DEBUG(2, "decreasing compression level %u by %u\n", ctx->compressionLevel, change);
ctx->compressionLevel -= change; ctx->compressionLevel -= boundChange;
} }
/* reset */ /* reset */
pthread_mutex_lock(&ctx->completion_mutex.pMutex); pthread_mutex_lock(&ctx->completion_mutex.pMutex);