* Make timer class a little bit more lightweight and accurate.

diff --git a/check/timer.cpp b/check/timer.cpp
index fff91e7dc44db0420ed2fcc0fb860bfa11f4b132..0b978a7ded82aadb3cea7a1ed4d68eda84c45d8e 100644 (file)
--- a/check/timer.cpp
+++ b/check/timer.cpp
@@ -29,14 +29,16 @@
 timer::timer() : on(false)
 {
        getrusage(RUSAGE_SELF, &used1);
 timer::timer() : on(false)
 {
        getrusage(RUSAGE_SELF, &used1);

-       getrusage(RUSAGE_SELF, &used2);
+       used2.ru_utime = used1.ru_utime;
+       used2.ru_stime = used1.ru_stime;

 }
 
 void timer::start()
 {
        on = true;
        getrusage(RUSAGE_SELF, &used1);
 }
 
 void timer::start()
 {
        on = true;
        getrusage(RUSAGE_SELF, &used1);

-       getrusage(RUSAGE_SELF, &used2);
+       used2.ru_utime = used1.ru_utime;
+       used2.ru_stime = used1.ru_stime;

 }
 
 void timer::stop()
 }
 
 void timer::stop()


@@ -48,19 +50,20 @@ void timer::stop()
 void timer::reset()
 {
        getrusage(RUSAGE_SELF, &used1);
 void timer::reset()
 {
        getrusage(RUSAGE_SELF, &used1);

-       getrusage(RUSAGE_SELF, &used2);
+       used2.ru_utime = used1.ru_utime;
+       used2.ru_stime = used1.ru_stime;

 }
 
 double timer::read()
 {
        double elapsed;
 }
 
 double timer::read()
 {
        double elapsed;

-       if (this->running())
+       if (running())

                getrusage(RUSAGE_SELF, &used2);
        elapsed = ((used2.ru_utime.tv_sec - used1.ru_utime.tv_sec) +
                getrusage(RUSAGE_SELF, &used2);
        elapsed = ((used2.ru_utime.tv_sec - used1.ru_utime.tv_sec) +

-                          (used2.ru_stime.tv_sec - used1.ru_stime.tv_sec) +
-                          (used2.ru_utime.tv_usec - used1.ru_utime.tv_usec) / 1e6 +
-                          (used2.ru_stime.tv_usec - used1.ru_stime.tv_usec) / 1e6);
-       // round to 10ms for safety:
+                  (used2.ru_stime.tv_sec - used1.ru_stime.tv_sec) +
+                  (used2.ru_utime.tv_usec - used1.ru_utime.tv_usec) * 1e-6 +
+                  (used2.ru_stime.tv_usec - used1.ru_stime.tv_usec) * 1e-6);
+       // Results more accurate than 10ms are pointless:

        return 0.01*int(elapsed*100+0.5);
 }
 
        return 0.01*int(elapsed*100+0.5);
 }