Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / jemalloc / test / src / timer.c

diff --git a/src/jemalloc/test/src/timer.c b/src/jemalloc/test/src/timer.c
index 36fbedd48952e02e0088b22a9ca1d7101d36f2e7..e91b3cf21f0d8aef8f70f6d3e9b12e208bf1b65d 100644 (file)
--- a/src/jemalloc/test/src/timer.c
+++ b/src/jemalloc/test/src/timer.c
@@ -4,22 +4,26 @@ void
 timer_start(timedelta_t *timer)
 {
 
-       gettimeofday(&timer->tv0, NULL);
+       nstime_init(&timer->t0, 0);
+       nstime_update(&timer->t0);
 }
 
 void
 timer_stop(timedelta_t *timer)
 {
 
-       gettimeofday(&timer->tv1, NULL);
+       nstime_copy(&timer->t1, &timer->t0);
+       nstime_update(&timer->t1);
 }
 
 uint64_t
 timer_usec(const timedelta_t *timer)
 {
+       nstime_t delta;
 
-       return (((timer->tv1.tv_sec - timer->tv0.tv_sec) * 1000000) +
-           timer->tv1.tv_usec - timer->tv0.tv_usec);
+       nstime_copy(&delta, &timer->t1);
+       nstime_subtract(&delta, &timer->t0);
+       return (nstime_ns(&delta) / 1000);
 }
 
 void
@@ -33,7 +37,7 @@ timer_ratio(timedelta_t *a, timedelta_t *b, char *buf, size_t buflen)
        int n;
 
        /* Whole. */
-       n = malloc_snprintf(&buf[i], buflen-i, "%"PRIu64, t0 / t1);
+       n = malloc_snprintf(&buf[i], buflen-i, "%"FMTu64, t0 / t1);
        i += n;
        if (i >= buflen)
                return;
@@ -50,7 +54,7 @@ timer_ratio(timedelta_t *a, timedelta_t *b, char *buf, size_t buflen)
                uint64_t round = (i+1 == buflen-1 && ((t0 * mult * 10 / t1) % 10
                    >= 5)) ? 1 : 0;
                n = malloc_snprintf(&buf[i], buflen-i,
-                   "%"PRIu64, (t0 * mult / t1) % 10 + round);
+                   "%"FMTu64, (t0 * mult / t1) % 10 + round);
                i += n;
                mult *= 10;
        }