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

created independent function for controlling how completion relates to compression level change

Browse Source
This commit is contained in:
Paul Cruz
2017-07-25 10:32:14 -07:00
parent 6f1e260edd
commit 85d7c919f6
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/adaptive-compression/adapt.c
+16 -3
View File
@@ -311,6 +311,19 @@ static void waitUntilAllJobsCompleted(adaptCCtx* ctx)
pthread_mutex_unlock(&ctx->allJobsCompleted_mutex.pMutex); pthread_mutex_unlock(&ctx->allJobsCompleted_mutex.pMutex);
} }
static unsigned convertCompletionToChange(double completion)
{
if (completion < 0.05) {
return 2;
}
else if (completion < 0.5) {
return 1;
}
else {
return 0;
}
}
/* /*
* Compression level is changed depending on which part of the compression process is lagging * Compression level is changed depending on which part of the compression process is lagging
* Currently, three theads exist for job creation, compression, and file writing respectively. * Currently, three theads exist for job creation, compression, and file writing respectively.
@@ -357,7 +370,7 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
/* create or write waiting on compression */ /* create or write waiting on compression */
/* use whichever one waited less because it was slower */ /* use whichever one waited less because it was slower */
double const completion = MAX(createWaitCompressionCompletion, writeWaitCompressionCompletion); double const completion = MAX(createWaitCompressionCompletion, writeWaitCompressionCompletion);
unsigned const change = (unsigned)((1-completion) * MAX_COMPRESSION_LEVEL_CHANGE); unsigned const change = convertCompletionToChange(completion);
unsigned const boundChange = MIN(change, ctx->compressionLevel - 1); unsigned const boundChange = MIN(change, ctx->compressionLevel - 1);
if (ctx->convergenceCounter > CONVERGENCE_LOWER_BOUND && boundChange != 0) { if (ctx->convergenceCounter > CONVERGENCE_LOWER_BOUND && boundChange != 0) {
/* reset convergence counter, might have been a spike */ /* reset convergence counter, might have been a spike */
@@ -373,7 +386,7 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
else if (1-compressWaitWriteCompletion > threshold) { else if (1-compressWaitWriteCompletion > threshold) {
/* compress waiting on write */ /* compress waiting on write */
double const completion = compressWaitWriteCompletion; double const completion = compressWaitWriteCompletion;
unsigned const change = (unsigned)((1-completion) * MAX_COMPRESSION_LEVEL_CHANGE); unsigned const change = convertCompletionToChange(completion);
unsigned const boundChange = MIN(change, ZSTD_maxCLevel() - ctx->compressionLevel); unsigned const boundChange = MIN(change, ZSTD_maxCLevel() - ctx->compressionLevel);
if (ctx->convergenceCounter > CONVERGENCE_LOWER_BOUND && boundChange != 0) { if (ctx->convergenceCounter > CONVERGENCE_LOWER_BOUND && boundChange != 0) {
ctx->convergenceCounter = 0; ctx->convergenceCounter = 0;
@@ -389,7 +402,7 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
/* compress waiting on create*/ /* compress waiting on create*/
/* use compressWaitCreateCompletion */ /* use compressWaitCreateCompletion */
double const completion = compressWaitCreateCompletion; double const completion = compressWaitCreateCompletion;
unsigned const change = (unsigned)((1-completion) * MAX_COMPRESSION_LEVEL_CHANGE); unsigned const change = convertCompletionToChange(completion);
unsigned const boundChange = MIN(change, ZSTD_maxCLevel() - ctx->compressionLevel); unsigned const boundChange = MIN(change, ZSTD_maxCLevel() - ctx->compressionLevel);
if (ctx->convergenceCounter > CONVERGENCE_LOWER_BOUND && boundChange != 0) { if (ctx->convergenceCounter > CONVERGENCE_LOWER_BOUND && boundChange != 0) {
ctx->convergenceCounter = 0; ctx->convergenceCounter = 0;