Reduce benchmark running time to 10 seconds if excessive (GH #983)

1 files changed, 23 insertions, 4 deletions

diff --git a/bench1.cpp b/bench1.cpp
index eec8f4ad..627d2b6f 100644
--- a/bench1.cpp
+++ b/bench1.cpp
@@ -349,6 +349,10 @@ void BenchmarkWithCommand(int argc, const char* const argv[])
 	float cpuFreq(argc >= 4 ? Test::StringToValue<float, true>(argv[3])*float(1e9) : 0.0f);

 	std::string algoName(argc >= 5 ? argv[4] : "");

 

+	// https://github.com/weidai11/cryptopp/issues/983

+	if (runningTime > 10.0f)

+		runningTime = 10.0f;

+

 	if (command == "b")  // All benchmarks

 		Benchmark(Test::All, runningTime, cpuFreq);

 	else if (command == "b4")  // Public key algorithms over EC

@@ -366,6 +370,9 @@ void Benchmark(Test::TestClass suites, double t, double hertz)
 	g_allocatedTime = t;

 	g_hertz = hertz;

 

+	// Add <br> in between tables

+	size_t count_breaks = 0;

+

 	AddHtmlHeader();

 

 	g_testBegin = ::time(NULLPTR);

@@ -376,28 +383,40 @@ void Benchmark(Test::TestClass suites, double t, double hertz)
 	// Unkeyed algorithms

 	if (suites & Test::Unkeyed)

 	{

-		std::cout << "\n<BR>";

+		if (count_breaks)

+			std::cout << "\n<BR>";

+		count_breaks++;

+

 		Benchmark1(t, hertz);

 	}

 

 	// Shared key algorithms

 	if (suites & Test::SharedKey)

 	{

-		std::cout << "\n<BR>";

+		if (count_breaks)

+			std::cout << "\n<BR>";

+		count_breaks++;

+

 		Benchmark2(t, hertz);

 	}

 

 	// Public key algorithms

 	if (suites & Test::PublicKey)

 	{

-		std::cout << "\n<BR>";

+		if (count_breaks)

+			std::cout << "\n<BR>";

+		count_breaks++;

+

 		Benchmark3(t, hertz);

 	}

 

 	// Public key algorithms over EC

 	if (suites & Test::PublicKeyEC)

 	{

-		std::cout << "\n<BR>";

+		if (count_breaks)

+			std::cout << "\n<BR>";

+		count_breaks++;

+

 		Benchmark4(t, hertz);

 	}