Print progress bar even if there is only one file

jkeiser · jkeiser · commit 7c6723d9129f · 2020-06-12T10:01:19.000-07:00
diff --git a/benchmark/parse.cpp b/benchmark/parse.cpp
@@ -83,7 +83,7 @@ struct option_struct {
   bool stage1_only = false;
 
   int32_t iterations = 200;
-  int32_t iteration_step = 50;
+  int32_t iteration_step = -1;
 
   bool verbose = false;
   bool tabbed_output = false;
@@ -149,18 +149,19 @@ struct option_struct {
       }
     }
 
+    if (iteration_step == -1) {
+      iteration_step = iterations / 50;
+      if (iteration_step < 200) { iteration_step = 200; }
+      if (iteration_step > iterations) { iteration_step = iterations; }
+    }
+
     // All remaining arguments are considered to be files
     for (int i=optind; i<argc; i++) {
       files.push_back(argv[i]);
     }
     if (files.empty()) {
       exit_usage("No files specified");
     }
-
-    // Keeps the numbers the same for CI (old ./parse didn't have a two-stage loop)
-    if (files.size() == 1) {
-      iteration_step = iterations;
-    }
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ struct option_struct {`
`83`	`83`	`bool stage1_only = false;`
`84`	`84`
`85`	`85`	`int32_t iterations = 200;`
`86`		`- int32_t iteration_step = 50;`
	`86`	`+ int32_t iteration_step = -1;`
`87`	`87`
`88`	`88`	`bool verbose = false;`
`89`	`89`	`bool tabbed_output = false;`
`@@ -149,18 +149,19 @@ struct option_struct {`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
	`152`	`+ if (iteration_step == -1) {`
	`153`	`+ iteration_step = iterations / 50;`
	`154`	`+ if (iteration_step < 200) { iteration_step = 200; }`
	`155`	`+ if (iteration_step > iterations) { iteration_step = iterations; }`
	`156`	`+ }`
	`157`	`+`
`152`	`158`	`// All remaining arguments are considered to be files`
`153`	`159`	`for (int i=optind; i<argc; i++) {`
`154`	`160`	`files.push_back(argv[i]);`
`155`	`161`	`}`
`156`	`162`	`if (files.empty()) {`
`157`	`163`	`exit_usage("No files specified");`
`158`	`164`	`}`
`159`		`-`
`160`		`- // Keeps the numbers the same for CI (old ./parse didn't have a two-stage loop)`
`161`		`- if (files.size() == 1) {`
`162`		`- iteration_step = iterations;`
`163`		`- }`
`164`	`165`	`}`
`165`	`166`	`};`
`166`	`167`