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

[Ethan Eade]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Ethan Eade <ethaneade>  07/03/30 22:19:53

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

Log message:
        The reset() method of cvd_timer now returns the elapsed time since the
        previous reset().

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

Patches:
Index: cvd/timer.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/timer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cvd/timer.h 7 Mar 2006 14:56:32 -0000       1.7
+++ cvd/timer.h 30 Mar 2007 22:19:53 -0000      1.8
@@ -57,7 +57,7 @@
                double conv_ntime(const struct timeval& tv);
                
                /// Sets the start time to the current time
-               void reset();                       
+               double reset();                       
 
 
        private:

Index: cvd_src/cvd_timer.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/cvd_timer.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cvd_src/cvd_timer.cc        7 Feb 2006 12:09:01 -0000       1.6
+++ cvd_src/cvd_timer.cc        30 Mar 2007 22:19:53 -0000      1.7
@@ -32,12 +32,15 @@
 
 namespace CVD {
 
-void cvd_timer::reset() 
+double cvd_timer::reset() 
 {
   struct timeval tv;
 
   gettimeofday(&tv,NULL);
-  startTime=(unsigned long long)tv.tv_sec*1000000+tv.tv_usec;
+  unsigned long long temp = (unsigned long long)tv.tv_sec*1000000+tv.tv_usec;
+  double elapsed =  (temp - startTime) / 1000000.0;
+  startTime = temp;
+  return elapsed;
 }
 
 double cvd_timer::get_time()