Fix few more things

UdjinM6 · UdjinM6 · commit f16ff507fa2c · 2021-07-04T21:54:17.000+03:00
diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
@@ -35,11 +35,16 @@ static fs::path SetDataDir()
 }
 static void SetupBenchArgs()
 {
+    gArgs.AddArg("-?", "Print this help message and exit", false, OptionsCategory::OPTIONS);
     gArgs.AddArg("-list", "List benchmarks without executing them", false, OptionsCategory::OPTIONS);
     gArgs.AddArg("-filter=<regex>", strprintf("Regular expression filter to select benchmark by name (default: %s)", DEFAULT_BENCH_FILTER), false, OptionsCategory::OPTIONS);
     gArgs.AddArg("-asymptote=n1,n2,n3,...", strprintf("Test asymptotic growth of the runtime of an algorithm, if supported by the benchmark"), false, OptionsCategory::OPTIONS);
     gArgs.AddArg("-output_csv=<output.csv>", "Generate CSV file with the most important benchmark results.", false, OptionsCategory::OPTIONS);
     gArgs.AddArg("-output_json=<output.json>", "Generate JSON file with all benchmark results.", false, OptionsCategory::OPTIONS);
+
+    // Hidden
+    gArgs.AddArg("-h", "", false, OptionsCategory::HIDDEN);
+    gArgs.AddArg("-help", "", false, OptionsCategory::HIDDEN);
 }
 
 // parses a comma separated list like "10,20,30,50"
@@ -66,7 +71,7 @@ int main(int argc, char** argv)
 
     if (HelpRequested(gArgs)) {
         std::cout << gArgs.GetHelpMessage();
-        return 0;
+        return EXIT_SUCCESS;
     }
 
     // Set the datadir after parsing the bench options
@@ -101,5 +106,5 @@ int main(int argc, char** argv)
 
     ECC_Stop();
 
-    return 0;
+    return EXIT_SUCCESS;
 }
diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp
@@ -4,18 +4,6 @@
 
 #include <bench/bench.h>
 #include <validation.h>
-#include <util/time.h>
-
-// Sanity test: this should loop ten times, and
-// min/max/average should be close to 100ms.
-static void Sleep100ms(benchmark::Bench& bench)
-{
-    bench.run([&] {
-        MilliSleep(100);
-    });
-}
-
-BENCHMARK(Sleep100ms);
 
 // Extremely fast-running benchmark:
 #include <math.h>

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,16 @@ static fs::path SetDataDir()`
`35`	`35`	`}`
`36`	`36`	`static void SetupBenchArgs()`
`37`	`37`	`{`
	`38`	`+ gArgs.AddArg("-?", "Print this help message and exit", false, OptionsCategory::OPTIONS);`
`38`	`39`	`gArgs.AddArg("-list", "List benchmarks without executing them", false, OptionsCategory::OPTIONS);`
`39`	`40`	`gArgs.AddArg("-filter=<regex>", strprintf("Regular expression filter to select benchmark by name (default: %s)", DEFAULT_BENCH_FILTER), false, OptionsCategory::OPTIONS);`
`40`	`41`	`gArgs.AddArg("-asymptote=n1,n2,n3,...", strprintf("Test asymptotic growth of the runtime of an algorithm, if supported by the benchmark"), false, OptionsCategory::OPTIONS);`
`41`	`42`	`gArgs.AddArg("-output_csv=<output.csv>", "Generate CSV file with the most important benchmark results.", false, OptionsCategory::OPTIONS);`
`42`	`43`	`gArgs.AddArg("-output_json=<output.json>", "Generate JSON file with all benchmark results.", false, OptionsCategory::OPTIONS);`
	`44`	`+`
	`45`	`+ // Hidden`
	`46`	`+ gArgs.AddArg("-h", "", false, OptionsCategory::HIDDEN);`
	`47`	`+ gArgs.AddArg("-help", "", false, OptionsCategory::HIDDEN);`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`// parses a comma separated list like "10,20,30,50"`
`@@ -66,7 +71,7 @@ int main(int argc, char** argv)`
`66`	`71`
`67`	`72`	`if (HelpRequested(gArgs)) {`
`68`	`73`	`std::cout << gArgs.GetHelpMessage();`
`69`		`- return 0;`
	`74`	`+ return EXIT_SUCCESS;`
`70`	`75`	`}`
`71`	`76`
`72`	`77`	`// Set the datadir after parsing the bench options`
`@@ -101,5 +106,5 @@ int main(int argc, char** argv)`
`101`	`106`
`102`	`107`	`ECC_Stop();`
`103`	`108`
`104`		`- return 0;`
	`109`	`+ return EXIT_SUCCESS;`
`105`	`110`	`}`