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

updated avg compression rate, also hiding progress bar behind a flag now

Browse Source
This commit is contained in:
Paul Cruz
2017-07-07 10:25:38 -07:00
parent 00bc5df4e0
commit 4679132f59
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/adaptive-compression/multi.c
+7 -1
View File
@@ -25,6 +25,7 @@ static clock_t g_time = 0;
static clock_t g_startTime = 0; static clock_t g_startTime = 0;
static clock_t const refreshRate = CLOCKS_PER_SEC / 60; /* 60 Hz */ static clock_t const refreshRate = CLOCKS_PER_SEC / 60; /* 60 Hz */
static size_t g_streamedSize = 0; static size_t g_streamedSize = 0;
static unsigned g_useProgressBar = 0;
typedef struct { typedef struct {
void* start; void* start;
@@ -243,11 +244,12 @@ static void* compressionThread(void* arg)
static void displayProgress(unsigned jobDoneID, unsigned cLevel, unsigned last) static void displayProgress(unsigned jobDoneID, unsigned cLevel, unsigned last)
{ {
if (!g_useProgressBar) return;
clock_t currTime = clock(); clock_t currTime = clock();
unsigned const refresh = currTime - g_time > refreshRate ? 1 : 0; unsigned const refresh = currTime - g_time > refreshRate ? 1 : 0;
double const timeElapsed = (double)((currTime - g_startTime) * 1000 / CLOCKS_PER_SEC); double const timeElapsed = (double)((currTime - g_startTime) * 1000 / CLOCKS_PER_SEC);
double const sizeMB = (double)g_streamedSize / (1 << 20); double const sizeMB = (double)g_streamedSize / (1 << 20);
double const avgCompRate = sizeMB / timeElapsed; double const avgCompRate = sizeMB * 1000 / timeElapsed;
if (refresh) { if (refresh) {
fprintf(stdout, "\r| %4u jobs completed | Current Compresion Level: %2u | Time Elapsed: %5.0f ms | Data Size: %7.1f MB | Avg Compression Rate: %6.2f MB/s |", jobDoneID, cLevel, timeElapsed, sizeMB, avgCompRate); fprintf(stdout, "\r| %4u jobs completed | Current Compresion Level: %2u | Time Elapsed: %5.0f ms | Data Size: %7.1f MB | Avg Compression Rate: %6.2f MB/s |", jobDoneID, cLevel, timeElapsed, sizeMB, avgCompRate);
if (last) { if (last) {
@@ -537,6 +539,10 @@ int main(int argCount, const char* argv[])
help(); help();
return 0; return 0;
} }
else if (strlen(argument) > 1 && argument[1] == 'p') {
g_useProgressBar = 1;
continue;
}
else { else {
DISPLAY("Error: invalid argument provided\n"); DISPLAY("Error: invalid argument provided\n");
ret = 1; ret = 1;