Changeset 51a2f3 in git

Timestamp:

Jul 18, 2008, 5:02:17 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

f788910a0a0eaa435bbec70de9b8455e3eb48d1b

Parents:

d8483724861721140e31f604ae41278d67e9ad21

Message:

*hannes: GETRUSAGE


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

File:

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

kernel/timer.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: timer.cc,v 1.6 2008-03-19 17:44:13 Singular Exp $ */
+/* $Id: timer.cc,v 1.7 2008-07-18 15:02:17 Singular Exp $ */
 
 /*
@@ -9 +9 @@
 
 #include "mod2.h"
+//#define GETRUSAGE
+#ifdef GETRUSAGE
+       #include <sys/time.h>
+       #include <sys/resource.h>
+       #include <unistd.h>
+#endif
 
 int        timerv = 0;
@@ -87 +93 @@
 * temp structure to get the time
 */
+#ifdef GETRUSAGE
+static struct rusage t_rec;
+#else
 static struct tms t_rec;
-
+#endif
 /*0 implementation*/
 
 int initTimer()
 {
+#ifdef GETRUSAGE
+  getrusage(RUSAGE_SELF,&t_rec); 
+  siStartTime = (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
+#else
   times(&t_rec);
   siStartTime = t_rec.tms_utime+t_rec.tms_stime;
+#endif
   return (int)time(NULL);
 }
@@ -100 +116 @@
 void startTimer()
 {
+#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
+#else
   times(&t_rec);
   startl = t_rec.tms_utime+t_rec.tms_stime;
+#endif
 }
 
@@ -110 +133 @@
 {
   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
+  curr -= siStartTime;
+  double f =  ((double)curr) * timer_resolution / (double)100;
+#else
 
   times(&t_rec);
@@ -115 +146 @@
 
   double f =  ((double)curr) * timer_resolution / (double)HZ;
+#endif
   return (int)(f+0.5);
 }
@@ -129 +161 @@
   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
+  curr -= startl;
+  double f =  ((double)curr) * timer_resolution / (double)100;
+#else
   times(&t_rec);
   curr = t_rec.tms_utime+t_rec.tms_stime - startl;
 
   double f =  ((double)curr) / (double)HZ;
+#endif
   if (f > mintime)
   {