Consolidate the non-canonical epoch timers, like cpuid and Win32's

QueryPerformanceCounter, into an entropy source hres_timer. Its
results, if any, do not count as contributing entropy to the poll.

Convert the other (monotonic/fixed epoch) timers to a single function
get_nanoseconds_clock(), living in time.h, which statically chooses
the 'best' timer type (clock_gettime, gettimeofday, std::clock, in
that order depending on what is available). Add feature test macros
for clock_gettime and gettimeofday.

Remove the Timer class and timer.h. Remove the Timer& argument to the
algorithm benchmark function.

1 files changed, 1 insertions, 2 deletions

diff --git a/doc/examples/benchmark.cpp b/doc/examples/benchmark.cpp
index d046e8d20..fa91726e5 100644
--- a/doc/examples/benchmark.cpp
+++ b/doc/examples/benchmark.cpp
@@ -17,7 +17,6 @@ int main(int argc, char* argv[])
    Botan::LibraryInitializer init;
 
    Botan::AutoSeeded_RNG rng;
-   Botan::Default_Benchmark_Timer timer;
 
    Botan::Algorithm_Factory& af = Botan::global_state().algorithm_factory();
 
@@ -28,7 +27,7 @@ int main(int argc, char* argv[])
       std::string algo = argv[i];
 
       std::map<std::string, double> results =
-         Botan::algorithm_benchmark(algo, ms, timer, rng, af);
+         Botan::algorithm_benchmark(algo, ms, rng, af);
 
       std::cout << algo << ":\n";
       for(std::map<std::string, double>::iterator r = results.begin();