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

change to >= convergence counter

Browse Source
This commit is contained in:
Paul Cruz
2017-07-26 10:20:29 -07:00
parent be92a38d6a
commit 305d5ee70f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/adaptive-compression/adapt.c
+8 -4
View File
@@ -384,35 +384,39 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
double const completion = MAX(createWaitCompressionCompletion, writeWaitCompressionCompletion); double const completion = MAX(createWaitCompressionCompletion, writeWaitCompressionCompletion);
unsigned const change = convertCompletionToChange(completion); 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 */
ctx->convergenceCounter = 0; ctx->convergenceCounter = 0;
DEBUG(2, "convergence counter reset, no change applied\n");
} }
else if (boundChange != 0) { else if (boundChange != 0) {
ctx->compressionLevel -= boundChange; ctx->compressionLevel -= boundChange;
ctx->cooldown = CLEVEL_DECREASE_COOLDOWN; ctx->cooldown = CLEVEL_DECREASE_COOLDOWN;
ctx->convergenceCounter = 1; ctx->convergenceCounter = 1;
}
DEBUG(2, "create or write threads waiting on compression, tried to decrease compression level by %u\n\n", boundChange); DEBUG(2, "create or write threads waiting on compression, tried to decrease compression level by %u\n\n", boundChange);
} }
}
else if (1-compressWaitWriteCompletion > threshold || 1-compressWaitCreateCompletion > threshold) { else if (1-compressWaitWriteCompletion > threshold || 1-compressWaitCreateCompletion > threshold) {
/* compress waiting on write */ /* compress waiting on write */
double const completion = MIN(compressWaitWriteCompletion, compressWaitCreateCompletion); double const completion = MIN(compressWaitWriteCompletion, compressWaitCreateCompletion);
unsigned const change = convertCompletionToChange(completion); 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) {
/* reset convergence counter, might have been a spike */
ctx->convergenceCounter = 0; ctx->convergenceCounter = 0;
DEBUG(2, "convergence counter reset, no change applied\n");
} }
else if (boundChange != 0) { else if (boundChange != 0) {
ctx->compressionLevel += boundChange; ctx->compressionLevel += boundChange;
ctx->cooldown = 0; ctx->cooldown = 0;
ctx->convergenceCounter = 1; ctx->convergenceCounter = 1;
}
DEBUG(2, "compress waiting on write or create, tried to increase compression level by %u\n\n", boundChange); DEBUG(2, "compress waiting on write or create, tried to increase compression level by %u\n\n", boundChange);
} }
}
if (ctx->compressionLevel == prevCompressionLevel) { if (ctx->compressionLevel == prevCompressionLevel) {
ctx->convergenceCounter++; ctx->convergenceCounter++;
} }