Changeset 52150679808ed6ea37f1eb4c564756a1894e43d6

Timestamp:

04/21/08 03:45:10 (9 months ago)

Author:

krayouva <krayouva@…>

Parents:

6ea76e69a6cae35e697e95d0aaa18c8ad62a0193

Children:

3e94658359c07330b5ea11ae8520fd41e676bba5

git-committer:

krayouva <krayouva@gmail.com> / 2008-04-20T13:45:10Z-0400

Message:

* Replaced times with getursage

Files:

• c/benchmark/benchmark.c (modified) (5 diffs)

c/benchmark/benchmark.c

@@ -1 @@
-#include <sys/times.h>
 #include <sys/time.h>
+#include <sys/resource.h>
 #include <unistd.h>
-#include <limits.h>
 #include <string.h>
 #include "global.h"
@@ -8 +7 @@
 #include "all_benchmarks.h"
 #include "word_list.h"
-
-static int hertz;
 
 static int bmtcmp(const void *p1, const void *p2)
@@ -60 +57 @@
 }
 
+#define TVAL_TO_SEC(before, after) \
+  ((double)after.tv_sec  + ((double)after.tv_usec/1000000)) - \
+  ((double)before.tv_sec + ((double)before.tv_usec/1000000))
+
 static void bm_single_run(BenchMarkUnit *unit, BenchMarkTimes *bm_times)
 {
     struct timeval tv_before, tv_after;
-    struct tms tms_before, tms_after;
-    double before, after;
+    struct rusage ru_before, ru_after;
 
     if (gettimeofday(&tv_before, NULL) == -1)
         RAISE(FRT_UNSUPPORTED_ERROR, "gettimeofday failed\n");
-    (void)times(&tms_before);
+    getrusage(RUSAGE_SELF, &ru_before);
 
     unit->run();
@@ -74 +74 @@
     if (gettimeofday(&tv_after, NULL) == -1)
         RAISE(FRT_UNSUPPORTED_ERROR, "gettimeofday failed\n");
-    (void)times(&tms_after);
-    before = (double)tv_before.tv_sec + ((double)tv_before.tv_usec/1000000);
-    after = (double)tv_after.tv_sec + ((double)tv_after.tv_usec/1000000);
-    bm_times->rtime = after - before;
-    bm_times->utime =
-        ((double)(tms_after.tms_utime - tms_before.tms_utime))/hertz;
-    bm_times->stime =
-        ((double)(tms_after.tms_stime - tms_before.tms_stime))/hertz;
+    getrusage(RUSAGE_SELF, &ru_after);
+
+    bm_times->rtime = TVAL_TO_SEC(tv_before, tv_after);
+    bm_times->utime = TVAL_TO_SEC(ru_before.ru_utime, ru_after.ru_utime);
+    bm_times->stime = TVAL_TO_SEC(ru_before.ru_stime, ru_after.ru_stime);
 }
 
@@ -159 +156 @@
     (void)argc; (void)argv;
     benchmark.head = benchmark.tail = NULL;
-    /* set the clock speed used for calculating run times */
-    hertz = sysconf(_SC_CLK_TCK);
 
     for (i = 0; i < NELEMS(all_benchmarks); i++) {