X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FGetTime.c;h=a2d9a3106060a6d387a1b3b59ead078d93b216f0;hb=b214419d68962f9979fb3ddd22150a8a25960be5;hp=3a0764cb91cf5094ef672630aee6f7b351323ce7;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c
index 3a0764c..a2d9a31 100644
--- a/rts/posix/GetTime.c
+++ b/rts/posix/GetTime.c
@@ -44,7 +44,7 @@ Ticks getProcessCPUTime(void)
 {
     struct rusage t;
     getrusage(RUSAGE_SELF, &t);
-    return (t.ru_utime.tv_sec * TICKS_PER_SECOND + 
+    return ((Ticks)t.ru_utime.tv_sec * TICKS_PER_SECOND +
 	    ((Ticks)t.ru_utime.tv_usec * TICKS_PER_SECOND)/1000000);
 }
 
@@ -52,7 +52,7 @@ Ticks getProcessElapsedTime(void)
 {
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
-    return (tv.tv_sec * TICKS_PER_SECOND +
+    return ((Ticks)tv.tv_sec * TICKS_PER_SECOND +
 	    ((Ticks)tv.tv_usec * TICKS_PER_SECOND)/1000000);
 }
 
@@ -89,7 +89,7 @@ void getProcessTimes(Ticks *user, Ticks *elapsed)
 	long ticks;
 	ticks = sysconf(_SC_CLK_TCK);
 	if ( ticks == -1 ) {
-	    errorBelch("sysconf\n");
+	    sysErrorBelch("sysconf");
 	    stg_exit(EXIT_FAILURE);
 	}
 	ClockFreq = ticks;
@@ -119,12 +119,14 @@ Ticks getThreadCPUTime(void)
     // clock_gettime() gives us per-thread CPU time.  It isn't
     // reliable on Linux, but it's the best we have.
     struct timespec ts;
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
-    return (ts.tv_sec * TICKS_PER_SECOND + 
-	    ((Ticks)ts.tv_nsec * TICKS_PER_SECOND) / 1000000000);
-#else
-    return getProcessCPUTime();
+    int res;
+    res = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
+    if (res == 0) {
+        return ((Ticks)ts.tv_sec * TICKS_PER_SECOND +
+                ((Ticks)ts.tv_nsec * TICKS_PER_SECOND) / 1000000000);
+    }
 #endif
+    return getProcessCPUTime();
 }
 
 nat