Changeset 971108 in git

Timestamp:

Jan 29, 2009, 5:57:02 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

5376a6afb7e0e9c5e8ba37a9e7964552e94edc3b

Parents:

13e74c6f235d10ce61e1c7e3a2eb3ec69cca9c7e

Message:

*hannes: int64


git-svn-id: file:///usr/local/Singular/svn/trunk@11341 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/timer.cc (modified) (5 diffs)

kernel/timer.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: timer.cc,v 1.8 2008-08-22 12:11:05 Singular Exp $ */
+/* $Id: timer.cc,v 1.9 2009-01-29 16:57:02 Singular Exp $ */
 
 /*
@@ -88 +88 @@
 * the start time of the timer
 */
+#ifdef GETRUSAGE
+static int64 siStartTime;
+static int64 startl;
+#else
+static clock_t siStartTime;
 static clock_t startl;
-static clock_t siStartTime;
+#endif
 
 /*3
@@ -119 +124 @@
 #ifdef GETRUSAGE
   getrusage(RUSAGE_SELF,&t_rec); 
-  startl = (t_rec.ru_utime.tv_sec*1000000+t_rec.ru_utime.tv_usec
-               +t_rec.ru_stime.tv_sec*1000000+t_rec.ru_stime.tv_usec
-               +5000)/10000; // unit is 1/100 sec
+  startl = ((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
 #else
   times(&t_rec);
@@ -133 +138 @@
 int getTimer()
 {
-  clock_t curr;
-#ifdef GETRUSAGE
-  getrusage(RUSAGE_SELF,&t_rec); 
-  curr = (t_rec.ru_utime.tv_sec*1000000+t_rec.ru_utime.tv_usec
-               +t_rec.ru_stime.tv_sec*1000000+t_rec.ru_stime.tv_usec
-               +5000)/10000; // unit is 1/100 sec
+#ifdef GETRUSAGE
+  int64 curr;
+  getrusage(RUSAGE_SELF,&t_rec); 
+  curr = ((int64)t_rec.ru_utime.tv_sec*1000000+(int64)t_rec.ru_utime.tv_usec
+         +(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 -= siStartTime;
   double f =  ((double)curr) * timer_resolution / (double)100;
 #else
+  clock_t curr;
 
   times(&t_rec);
@@ -160 +166 @@
 void writeTime(const char* v)
 {
-  clock_t curr;
-
-#ifdef GETRUSAGE
-  getrusage(RUSAGE_SELF,&t_rec); 
-  curr = (t_rec.ru_utime.tv_sec*1000000+t_rec.ru_utime.tv_usec
-               +t_rec.ru_stime.tv_sec*1000000+t_rec.ru_stime.tv_usec
-               +5000)/10000; // unit is 1/100 sec
+
+#ifdef GETRUSAGE
+  int64 curr;
+  getrusage(RUSAGE_SELF,&t_rec); 
+  curr = ((int64)t_rec.ru_utime.tv_sec*1000000+(int64)t_rec.ru_utime.tv_usec
+               +(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;
   double f =  ((double)curr) * timer_resolution / (double)100;
 #else
+  clock_t curr;
   times(&t_rec);
   curr = t_rec.tms_utime+t_rec.tms_stime - startl;