[libcvd-members] libcvd cvd/timer.h cvd_src/cvd_timer.cc

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/03/05 00:35:43

Modified files:
        cvd            : timer.h 
        cvd_src        : cvd_timer.cc 

Log message:
        Mild refactoring. Fixed uninitialized bug from valgrind.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/timer.h?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/cvd_timer.cc?cvsroot=libcvd&r1=1.7&r2=1.8

Patches:
Index: cvd/timer.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/timer.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cvd/timer.h 2 Apr 2007 15:58:54 -0000       1.9
+++ cvd/timer.h 5 Mar 2008 00:35:43 -0000       1.10
@@ -42,7 +42,7 @@
 {
        public:
                /// Create a timer, and set the start time to be now
-               cvd_timer() {reset();};
+               cvd_timer();
                /// How many seconds have elapsed since the start time?
                double get_time();
 

Index: cvd_src/cvd_timer.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/cvd_timer.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cvd_src/cvd_timer.cc        30 Mar 2007 22:19:53 -0000      1.7
+++ cvd_src/cvd_timer.cc        5 Mar 2008 00:35:43 -0000       1.8
@@ -32,12 +32,21 @@
 
 namespace CVD {
 
-double cvd_timer::reset() 
+unsigned long long get_time_of_day_us()
 {
   struct timeval tv;
-
   gettimeofday(&tv,NULL);
-  unsigned long long temp = (unsigned long long)tv.tv_sec*1000000+tv.tv_usec;
+       return (unsigned long long)tv.tv_sec*1000000+tv.tv_usec;
+}
+
+cvd_timer::cvd_timer()
+{
+       startTime = get_time_of_day_us();
+}
+
+double cvd_timer::reset() 
+{
+  unsigned long long temp  = get_time_of_day_us();
   double elapsed =  (temp - startTime) / 1000000.0;
   startTime = temp;
   return elapsed;
@@ -45,13 +54,7 @@
 
 double cvd_timer::get_time() 
 {
-  struct timeval tv;
-  unsigned long long temp;  // keep with integer arithmetic for diff
-
-  gettimeofday(&tv,NULL);
-  temp=(unsigned long long)tv.tv_sec*1000000+tv.tv_usec;
-
-  return (temp-startTime)/1000000.0;
+  return (get_time_of_day_us()-startTime)/1000000.0;
 }
 
 // Conv from units of nanosecs (specifically for v4l2 : kernel 2.4
@@ -73,12 +76,7 @@
 
 double get_time_of_day() 
 {
-  struct timeval tv;
-  unsigned long long temp;  // keep with integer arithmetic for diff
-
-  gettimeofday(&tv,NULL);
-  temp=(unsigned long long)tv.tv_sec*1000000+tv.tv_usec;
-  return temp/1000000.0;
+  return get_time_of_day_us()/1000000.0;
 }