X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FGetTime.c;h=a2d9a3106060a6d387a1b3b59ead078d93b216f0;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hp=0e591ef5517ed1516b0980a5b163f6702724f76a;hpb=186a80cbcfbe0490ddd153e5f75faac23f4e5021;p=ghc-hetmet.git

diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c
index 0e591ef..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 ((Ticks)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);
 }
 
@@ -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 ((Ticks)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