Changeset 9ea3497 in git

Timestamp:

May 2, 2024, 11:13:39 AM (2 weeks ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

aefe9ae36ec8df52dbdbefda02828f18f27715b3

Parents:

2a584933abf2a2d3082034c7586d38bb6de1a30a

Message:

unify timer stuff

Location:

kernel/oswrapper

Files:

• timer.cc (modified) (5 diffs)
• timer.h (modified) (1 diff)

kernel/oswrapper/timer.cc

@@ -57 +57 @@
 */
 STATIC_VAR int64 siStartTime;
-STATIC_VAR int64 startl;
 
 /*3
@@ -81 +80 @@
 {
   getrusage(RUSAGE_SELF,&t_rec);
-  startl = ((int64)t_rec.ru_utime.tv_sec*1000000+(int64)t_rec.ru_utime.tv_usec
+  siStartTime = ((int64)t_rec.ru_utime.tv_sec*1000000+(int64)t_rec.ru_utime.tv_usec
                +(int64)t_rec.ru_stime.tv_sec*1000000+t_rec.ru_stime.tv_usec
                +(int64)5000)/(int64)10000; // unit is 1/100 sec
   getrusage(RUSAGE_CHILDREN,&t_rec);
-  startl += ((int64)t_rec.ru_utime.tv_sec*1000000+(int64)t_rec.ru_utime.tv_usec
+  siStartTime += ((int64)t_rec.ru_utime.tv_sec*1000000+(int64)t_rec.ru_utime.tv_usec
                +(int64)t_rec.ru_stime.tv_sec*1000000+t_rec.ru_stime.tv_usec
                +(int64)5000)/(int64)10000; // unit is 1/100 sec
@@ -93 +92 @@
 * returns the time since a fixed point in seconds
 */
-int getTimer()
+long getTimer()
 {
   int64 curr;
@@ -106 +105 @@
   curr -= siStartTime;
   double f =  ((double)curr) * timer_resolution / (double)100;
-  return (int)(f+0.5);
+  return (long)(f+0.5);
 }
 
@@ -128 +127 @@
                +(int64)t_rec.ru_stime.tv_sec*1000000+(int64)t_rec.ru_stime.tv_usec
                +(int64)5000)/(int64)10000; // unit is 1/100 sec
-  curr -= startl;
+  curr -= siStartTime;
   double f =  ((double)curr) * timer_resolution / (double)100;
   if (f/timer_resolution > mintime)

kernel/oswrapper/timer.h

@@ -12 +12 @@
 void writeTime(const char* s);
 
-int initTimer();
-int  getTimer();
+int  initTimer();
+long getTimer();
 
 EXTERN_VAR int rtimerv;