lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-08 17:22:10 +03:00
Code Activity

patched style errors, add ability to bound compression level variation

Browse Source
This commit is contained in:
Paul Cruz
2017-07-28 15:30:46 -07:00
parent 2320e7378a
commit ff54fced64
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
contrib/adaptive-compression/adapt.c
View File

@@ -42,6 +42,8 @@ static size_t g_streamedSize = 0;
static unsigned g_useProgressBar = 1; static unsigned g_useProgressBar = 1;
static UTIL_freq_t g_ticksPerSecond; static UTIL_freq_t g_ticksPerSecond;
static unsigned g_forceCompressionLevel = 0; static unsigned g_forceCompressionLevel = 0;
static unsigned g_minCLevel = 1;
static unsigned g_maxCLevel = 22;
typedef struct { typedef struct {
void* start; void* start;
@@ -420,7 +422,7 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
/* 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 = convertCompletionToChange(completion); unsigned const change = convertCompletionToChange(completion);
unsigned const boundChange = MIN(change, ctx->compressionLevel - 1); unsigned const boundChange = ctx->compressionLevel >= g_minCLevel ? MIN(change, ctx->compressionLevel - g_minCLevel) : 0;
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;
@@ -438,7 +440,7 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
/* 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 = g_maxCLevel >= ctx->compressionLevel ? MIN(change, g_maxCLevel - ctx->compressionLevel) : 0;
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;
@@ -620,17 +622,19 @@ static void* compressionThread(void* arg)
static void displayProgress(unsigned cLevel, unsigned last) static void displayProgress(unsigned cLevel, unsigned last)
{ {
if (!g_useProgressBar) return; if (!g_useProgressBar) return;
UTIL_time_t currTime; {
UTIL_getTime(&currTime); UTIL_time_t currTime;
double const timeElapsed = (double)(UTIL_getSpanTimeMicro(g_ticksPerSecond, g_startTime, currTime) / 1000.0); UTIL_getTime(&currTime);
double const sizeMB = (double)g_streamedSize / (1 << 20); double const timeElapsed = (double)(UTIL_getSpanTimeMicro(g_ticksPerSecond, g_startTime, currTime) / 1000.0);
double const avgCompRate = sizeMB * 1000 / timeElapsed; double const sizeMB = (double)g_streamedSize / (1 << 20);
fprintf(stderr, "\r| Comp. Level: %2u | Time Elapsed: %7.2f s | Data Size: %7.1f MB | Avg Comp. Rate: %6.2f MB/s |", cLevel, timeElapsed/1000.0, sizeMB, avgCompRate); double const avgCompRate = sizeMB * 1000 / timeElapsed;
if (last) { fprintf(stderr, "\r| Comp. Level: %2u | Time Elapsed: %7.2f s | Data Size: %7.1f MB | Avg Comp. Rate: %6.2f MB/s |", cLevel, timeElapsed/1000.0, sizeMB, avgCompRate);
fprintf(stderr, "\n"); if (last) {
} fprintf(stderr, "\n");
else { }
fflush(stderr); else {
fflush(stderr);
}
} }
} }
@@ -928,9 +932,9 @@ static int freeFileCompressionResources(fcResources* fcr)
static int compressFilename(const char* const srcFilename, const char* const dstFilenameOrNull) static int compressFilename(const char* const srcFilename, const char* const dstFilenameOrNull)
{ {
int ret = 0; int ret = 0;
fcResources fcr = createFileCompressionResources(srcFilename, dstFilenameOrNull);
UTIL_getTime(&g_startTime); UTIL_getTime(&g_startTime);
g_streamedSize = 0; g_streamedSize = 0;
fcResources fcr = createFileCompressionResources(srcFilename, dstFilenameOrNull);
ret |= performCompression(fcr.ctx, fcr.srcFile, fcr.otArg); ret |= performCompression(fcr.ctx, fcr.srcFile, fcr.otArg);
ret |= freeFileCompressionResources(&fcr); ret |= freeFileCompressionResources(&fcr);
return ret; return ret;
@@ -973,7 +977,7 @@ static unsigned readU32FromChar(const char** stringPtr)
return result; return result;
} }
static void help() static void help(void)
{ {
PRINT("Usage:\n"); PRINT("Usage:\n");
PRINT(" ./multi [options] [file(s)]\n"); PRINT(" ./multi [options] [file(s)]\n");
@@ -986,6 +990,8 @@ static void help()
PRINT(" -c : force write to stdout\n"); PRINT(" -c : force write to stdout\n");
PRINT(" -p : hide progress bar\n"); PRINT(" -p : hide progress bar\n");
PRINT(" -q : quiet mode -- do not show progress bar or other information\n"); PRINT(" -q : quiet mode -- do not show progress bar or other information\n");
PRINT(" -l# : provide lower bound for compression level\n");
PRINT(" -u# : provide upper bound for compression level\n");
} }
/* return 0 if successful, else return error */ /* return 0 if successful, else return error */
int main(int argCount, const char* argv[]) int main(int argCount, const char* argv[])
@@ -993,10 +999,10 @@ int main(int argCount, const char* argv[])
const char* outFilename = NULL; const char* outFilename = NULL;
const char** filenameTable = (const char**)malloc(argCount*sizeof(const char*)); const char** filenameTable = (const char**)malloc(argCount*sizeof(const char*));
unsigned filenameIdx = 0; unsigned filenameIdx = 0;
filenameTable[0] = stdinmark;
unsigned forceStdout = 0; unsigned forceStdout = 0;
int ret = 0; int ret = 0;
int argNum; int argNum;
filenameTable[0] = stdinmark;
UTIL_initTimer(&g_ticksPerSecond); UTIL_initTimer(&g_ticksPerSecond);
@@ -1036,6 +1042,14 @@ int main(int argCount, const char* argv[])
g_useProgressBar = 0; g_useProgressBar = 0;
g_displayLevel = 0; g_displayLevel = 0;
break; break;
case 'l':
argument += 2;
g_minCLevel = readU32FromChar(&argument);
break;
case 'u':
argument += 2;
g_maxCLevel = readU32FromChar(&argument);
break;
default: default:
DISPLAY("Error: invalid argument provided\n"); DISPLAY("Error: invalid argument provided\n");
ret = 1; ret = 1;