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.

5 files changed, 5 insertions, 9 deletions

diff --git a/doc/examples/bench.cpp b/doc/examples/bench.cpp
index cc43fade0..6a15df7c0 100644
--- a/doc/examples/bench.cpp
+++ b/doc/examples/bench.cpp
@@ -64,11 +64,10 @@ void benchmark_algo(const std::string& algo,
                     RandomNumberGenerator& rng)
    {
    u32bit milliseconds = 3000;
-   Default_Benchmark_Timer timer;
    Algorithm_Factory& af = global_state().algorithm_factory();
 
    std::map<std::string, double> speeds =
-      algorithm_benchmark(algo, milliseconds, timer, rng, af);
+      algorithm_benchmark(algo, milliseconds, rng, af);
 
    std::cout << algo << ":";
 
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();
diff --git a/doc/examples/ca.cpp b/doc/examples/ca.cpp
index 9195be418..b98e6620e 100644
--- a/doc/examples/ca.cpp
+++ b/doc/examples/ca.cpp
@@ -15,7 +15,7 @@
 
 #include <botan/botan.h>
 #include <botan/x509_ca.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 using namespace Botan;
 
 #include <iostream>
diff --git a/doc/examples/gen_certs.cpp b/doc/examples/gen_certs.cpp
index 90cb80038..1c95402f4 100644
--- a/doc/examples/gen_certs.cpp
+++ b/doc/examples/gen_certs.cpp
@@ -5,7 +5,7 @@
 
 #include <botan/botan.h>
 #include <botan/rsa.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 #include <botan/x509self.h>
 #include <botan/x509_ca.h>
 
diff --git a/doc/examples/hash_quickly.cpp b/doc/examples/hash_quickly.cpp
index e719a7178..c8c8ca5fb 100644
--- a/doc/examples/hash_quickly.cpp
+++ b/doc/examples/hash_quickly.cpp
@@ -23,12 +23,10 @@ void set_fastest_implementation(const std::string& algo,
                                 Botan::RandomNumberGenerator& rng,
                                 double ms = 30)
    {
-   Botan::Default_Benchmark_Timer timer;
-
    Botan::Algorithm_Factory& af = Botan::global_state().algorithm_factory();
 
    std::map<std::string, double> results =
-      Botan::algorithm_benchmark(algo, ms, timer, rng, af);
+      Botan::algorithm_benchmark(algo, ms, rng, af);
 
    std::string fastest_provider = "";
    double best_res = 0;