From 1706ce646a1dcee1df5d8fc85a4d7f8531cf81b9 Mon Sep 17 00:00:00 2001 From: weidai Date: Fri, 1 Aug 2003 03:07:33 +0000 Subject: [PATCH] add b2 command --- trunk/c5/bench.cpp | 2 -- trunk/c5/bench.h | 3 ++- trunk/c5/test.cpp | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/trunk/c5/bench.cpp b/trunk/c5/bench.cpp index 571264f2..c00bc069 100644 --- a/trunk/c5/bench.cpp +++ b/trunk/c5/bench.cpp @@ -206,8 +206,6 @@ void BenchMarkKeyless(const char *name, double timeTotal, T *x=NULL) BenchMark(name, c, timeTotal); } -void BenchmarkAll2(double t); - void BenchmarkAll(double t) { #if 1 diff --git a/trunk/c5/bench.h b/trunk/c5/bench.h index e490daf8..496b07a1 100644 --- a/trunk/c5/bench.h +++ b/trunk/c5/bench.h @@ -5,6 +5,7 @@ extern const double CLOCK_TICKS_PER_SECOND; -void BenchmarkAll(double t=1.0); +void BenchmarkAll(double t); +void BenchmarkAll2(double t); #endif diff --git a/trunk/c5/test.cpp b/trunk/c5/test.cpp index a21d351d..77546d2c 100644 --- a/trunk/c5/test.cpp +++ b/trunk/c5/test.cpp @@ -265,12 +265,9 @@ int CRYPTOPP_CDECL main(int argc, char *argv[]) else if (command == "v") return !Validate(argc>2 ? atoi(argv[2]) : 0, argv[1][1] == 'v', argc>3 ? argv[3] : NULL); else if (command == "b") - { - if (argc<3) - BenchmarkAll(); - else - BenchmarkAll((float)atof(argv[2])); - } + BenchmarkAll(argc<3 ? 1 : atof(argv[2])); + else if (command == "b2") + BenchmarkAll2(argc<3 ? 1 : atof(argv[2])); else if (command == "z") GzipFile(argv[3], argv[4], argv[2][0]-'0'); else if (command == "u")