Unified progress implementation.

Author: kext

src/6d6copy.c

@@ -11,6 +11,7 @@
 #include "i18n.h"
 #include "i18n_error.h"
 #include "monotonic-time.h"
+#include "progress.h"
 
 const char *program = "6d6copy";
 static void help(const char *arg)
@@ -153,9 +154,7 @@ int main(int argc, char **argv)
     if (m != l) io_error(3);
     n += m;
     if (progress == 1) {
-      fprintf(stderr, "%2$3d%% %1$6.1f MB        \r",
-        (double) n / 1000000,
-        (int) (100 * n / end));
+      progress_update(n, end);
     } else if (progress == 2) {
       t = monotonic_time();
       if (t - t1 >= _50ms) {
@@ -169,7 +168,7 @@ int main(int argc, char **argv)
   }
 
   if (progress == 1) {
-    fprintf(stderr, "%2$3d%% %1$6.1f MB        \n", (double) end / 1000000, 100);
+    progress_complete(end);
   } else if (progress == 2) {
     t = monotonic_time();
     fprintf(stdout,

src/6d6mseed.c

@@ -25,6 +25,7 @@
 #include "wmseed.h"
 #define RESAMPLER_IMPLEMENTATION
 #include "resampler.h"
+#include "progress.h"
 
 static FILE *_logfile = 0;
 static void log_entry(FILE *f, const char *format, ...)
@@ -483,8 +484,7 @@ int main(int argc, char **argv)
       }
     }
     if (progress == 1 && i % 1024 == 0) {
-      fprintf(stderr, "%5.1f%% %8.1fMB     \r", i * 100.0 / h_end.address, i * 512.0 / 1000000);
-      fflush(stderr);
+      progress_update(i * 512ll, h_end.address * 512ll);
     } else if (progress == 2) {
       t2 = monotonic_time();
       if (t2 - t1 >= _50ms) {
@@ -501,8 +501,7 @@ int main(int argc, char **argv)
     wmseed_destroy(channels[c]);
   }
   if (progress == 1) {
-    log_entry(stderr, "%5.1f%% %8.1fMB     \n", 100.0, h_end.address * 512.0 / 1000000);
-    fflush(stderr);
+    progress_complete(h_end.address * 512ll);
   } else if (progress == 2) {
     t2 = monotonic_time();
     fprintf(stdout,

src/6d6read.c

@@ -17,6 +17,7 @@
 #include "i18n_error.h"
 #include "monotonic-time.h"
 #include "tai.h"
+#include "progress.h"
 
 #define SAMPLE_TRACKER_IMPLEMENTATION
 #include "sample-tracker.h"
@@ -333,8 +334,7 @@ int main(int argc, char **argv)
       }
     }
     if (progress == 1 && i % 1024 == 0) {
-      fprintf(stderr, "%3d%% %6.1fMB     \r", (int) (i * 100 / h_end.address), (double) i * 512 / 1000000l);
-      fflush(stderr);
+      progress_update(i * 512ll, h_end.address * 512ll);
     } else if (progress == 2) {
       t2 = monotonic_time();
       if (t2 - t1 >= _50ms) {
@@ -358,8 +358,7 @@ int main(int argc, char **argv)
     return 1;
   }
   if (progress == 1) {
-    fprintf(stderr, "%3d%% %6.1fMB     \n", 100, (double) h_end.address * 512 / 1000000l);
-    fflush(stderr);
+    progress_complete(h_end.address * 512ll);
   } else if (progress == 2) {
     t2 = monotonic_time();
     fprintf(stderr,

src/6d6strip.c

@@ -15,6 +15,7 @@
 #include "tai.h"
 #include "i18n.h"
 #include "i18n_error.h"
+#include "progress.h"
 
 static const char *program = "6d6strip";
 static void help(const char *arg)
@@ -205,8 +206,7 @@ int main(int argc, char **argv)
       }
     }
     if (progress && i % 1024 == 0) {
-      fprintf(stderr, "%3d%% %6.1fMB     \r", (int) (i * 100 / h_end.address), (double) i * 512 / 1000000l);
-      fflush(stderr);
+      progress_update(i * 512ll, h_end.address * 512ll);
     }
   }
 done:
@@ -216,8 +216,7 @@ int main(int argc, char **argv)
     frame_counter = 0;
   }
   if (progress) {
-    fprintf(stderr, "%3d%% %6.1fMB     \n", 100, (double) h_end.address * 512 / 1000000l);
-    fflush(stderr);
+    progress_complete(h_end.address * 512ll);
   }
   return 0;
 }

src/progress.h

@@ -0,0 +1,16 @@
+#ifndef PROGRESS_H
+#define PROGRESS_H
+
+#include <stdio.h>
+
+static void progress_update(long long done, long long total) {
+  fprintf(stderr, "%5.1f%% %8.1fMB     \r", 100.0 * done / total, done * 1e-6);
+  fflush(stderr);
+}
+
+static void progress_complete(long long total) {
+  fprintf(stderr, "%5.1f%% %8.1fMB     \n", 100.0, total * 1e-6);
+  fflush(stderr);
+}
+
+#endif