[PATCH] Support for mmap of hugetlb files as memory backing

[fio.git] / time.c

diff --git a/time.c b/time.c
index d08c791673f55b8139be5ec20cc757a891913423..d0ecbe5c831af59f857164af9fa433d96eaceda0 100644 (file)
--- a/time.c
+++ b/time.c
@@ -7,7 +7,7 @@ static struct timeval genesis;
 
 unsigned long utime_since(struct timeval *s, struct timeval *e)
 {
-       double sec, usec;
+       long sec, usec;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -21,17 +21,17 @@ unsigned long utime_since(struct timeval *s, struct timeval *e)
        return sec + usec;
 }
 
-static unsigned long utime_since_now(struct timeval *s)
+unsigned long utime_since_now(struct timeval *s)
 {
        struct timeval t;
 
-       gettimeofday(&t, NULL);
+       fio_gettime(&t, NULL);
        return utime_since(s, &t);
 }
 
 unsigned long mtime_since(struct timeval *s, struct timeval *e)
 {
-       double sec, usec;
+       long sec, usec;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -49,8 +49,9 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
 unsigned long mtime_since_now(struct timeval *s)
 {
        struct timeval t;
+       void *p = __builtin_return_address(0);
 
-       gettimeofday(&t, NULL);
+       fio_gettime(&t, p);
        return mtime_since(s, &t);
 }
 
@@ -66,7 +67,7 @@ void __usec_sleep(unsigned int usec)
 {
        struct timeval start;
 
-       gettimeofday(&start, NULL);
+       fio_gettime(&start, NULL);
        while (utime_since_now(&start) < usec)
                nop;
 }
@@ -128,9 +129,9 @@ unsigned long mtime_since_genesis(void)
        return mtime_since_now(&genesis);
 }
 
-void time_init(void)
+static void fio_init time_init(void)
 {
-       gettimeofday(&genesis, NULL);
+       fio_gettime(&genesis, NULL);
 }
 
 void fill_start_time(struct timeval *t)