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

updated progress bar with better representation of time, added const

Browse Source
This commit is contained in:
Paul Cruz 2017-07-25 16:03:43 -07:00
parent 9a132707af
commit 8dbb07d822
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,7 @@ static void adaptCompressionLevel(adaptCCtx* ctx)
static size_t getUseableDictSize(unsigned compressionLevel) static size_t getUseableDictSize(unsigned compressionLevel)
{ {
ZSTD_parameters params = ZSTD_getParams(compressionLevel, 0, 0); ZSTD_parameters const params = ZSTD_getParams(compressionLevel, 0, 0);
unsigned const overlapLog = compressionLevel >= (unsigned)ZSTD_maxCLevel() ? 0 : 3; unsigned const overlapLog = compressionLevel >= (unsigned)ZSTD_maxCLevel() ? 0 : 3;
size_t const overlapSize = 1 << (params.cParams.windowLog - overlapLog); size_t const overlapSize = 1 << (params.cParams.windowLog - overlapLog);
return overlapSize; return overlapSize;
@ -447,7 +447,7 @@ static size_t getUseableDictSize(unsigned compressionLevel)
static void* compressionThread(void* arg) static void* compressionThread(void* arg)
{ {
adaptCCtx* ctx = (adaptCCtx*)arg; adaptCCtx* const ctx = (adaptCCtx*)arg;
unsigned currJob = 0; unsigned currJob = 0;
for ( ; ; ) { for ( ; ; ) {
unsigned const currJobIndex = currJob % ctx->numJobs; unsigned const currJobIndex = currJob % ctx->numJobs;
@ -593,7 +593,7 @@ static void displayProgress(unsigned cLevel, unsigned last)
double const timeElapsed = (double)(UTIL_getSpanTimeMicro(g_ticksPerSecond, g_startTime, currTime) / 1000.0); double const timeElapsed = (double)(UTIL_getSpanTimeMicro(g_ticksPerSecond, g_startTime, currTime) / 1000.0);
double const sizeMB = (double)g_streamedSize / (1 << 20); double const sizeMB = (double)g_streamedSize / (1 << 20);
double const avgCompRate = sizeMB * 1000 / timeElapsed; double const avgCompRate = sizeMB * 1000 / timeElapsed;
fprintf(stderr, "\r| Comp. Level: %2u | Time Elapsed: %5.0f s | Data Size: %7.1f MB | Avg Comp. Rate: %6.2f MB/s |", cLevel, timeElapsed/1000.0, sizeMB, avgCompRate); 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);
if (last) { if (last) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
@ -638,7 +638,6 @@ static void* outputThread(void* arg)
return arg; return arg;
} }
{ {
// size_t const writeSize = fwrite(job->dst.start, 1, compressedSize, dstFile);
size_t const blockSize = MAX(compressedSize >> 7, 1 << 10); size_t const blockSize = MAX(compressedSize >> 7, 1 << 10);
size_t pos = 0; size_t pos = 0;
for ( ; ; ) { for ( ; ; ) {