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

diff --git a/contrib/adaptive-compression/multi.c b/contrib/adaptive-compression/multi.c
index f8568c42fe03da4e3b3390c3371f76e26c8b5720..5223d706855bda45a2c7923f716826764ad85d9b 100644 (file)
--- a/contrib/adaptive-compression/multi.c
+++ b/contrib/adaptive-compression/multi.c
@@ -25,6 +25,7 @@ static clock_t g_time = 0;
 static clock_t g_startTime = 0;
 static clock_t const refreshRate = CLOCKS_PER_SEC / 60; /* 60 Hz */
 static size_t g_streamedSize = 0;
+static unsigned g_useProgressBar = 0;
 
 typedef struct {
     void* start;
@@ -243,11 +244,12 @@ static void* compressionThread(void* arg)
 
 static void displayProgress(unsigned jobDoneID, unsigned cLevel, unsigned last)
 {
+    if (!g_useProgressBar) return;
     clock_t currTime = clock();
     unsigned const refresh = currTime - g_time > refreshRate ? 1 : 0;
     double const timeElapsed = (double)((currTime - g_startTime) * 1000 / CLOCKS_PER_SEC);
     double const sizeMB = (double)g_streamedSize / (1 << 20);
-    double const avgCompRate = sizeMB / timeElapsed;
+    double const avgCompRate = sizeMB * 1000 / timeElapsed;
     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);
         if (last) {
@@ -537,6 +539,10 @@ int main(int argCount, const char* argv[])
                 help();
                 return 0;
             }
+            else if (strlen(argument) > 1 && argument[1] == 'p') {
+                g_useProgressBar = 1;
+                continue;
+            }
             else {
                 DISPLAY("Error: invalid argument provided\n");
                 ret = 1;