Merge branch 'master' into gfio

[fio.git] / gettime.c

diff --git a/gettime.c b/gettime.c
index 72fda3f8597e335be2fc4677a208f02db9fa62b7..35d685e1576149974d5e77f18db2b1fb180f3a9e 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -19,11 +19,7 @@ static unsigned long last_cycles;
 static struct timeval last_tv;
 static int last_tv_valid;
 
-static struct timeval *fio_tv;
-int fio_gtod_offload = 0;
-int fio_gtod_cpu = -1;
-
-enum fio_cs fio_clock_source = CS_GTOD;
+enum fio_cs fio_clock_source = FIO_PREFERRED_CLOCK_SOURCE;
 
 #ifdef FIO_DEBUG_TIME
 
@@ -140,7 +136,11 @@ void fio_gettime(struct timeval *tp, void fio_unused *caller)
        case CS_CGETTIME: {
                struct timespec ts;
 
+#ifdef FIO_HAVE_CLOCK_MONOTONIC
+               if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0) {
+#else
                if (clock_gettime(CLOCK_REALTIME, &ts) < 0) {
+#endif
                        log_err("fio: clock_gettime fails\n");
                        assert(0);
                }
@@ -262,13 +262,68 @@ void fio_clock_init(void)
        calibrate_cpu_clock();
 }
 
-void fio_gtod_init(void)
+unsigned long long utime_since(struct timeval *s, struct timeval *e)
 {
-       fio_tv = smalloc(sizeof(struct timeval));
-       assert(fio_tv);
+       long sec, usec;
+       unsigned long long ret;
+
+       sec = e->tv_sec - s->tv_sec;
+       usec = e->tv_usec - s->tv_usec;
+       if (sec > 0 && usec < 0) {
+               sec--;
+               usec += 1000000;
+       }
+
+       /*
+        * time warp bug on some kernels?
+        */
+       if (sec < 0 || (sec == 0 && usec < 0))
+               return 0;
+
+       ret = sec * 1000000ULL + usec;
+
+       return ret;
+}
+
+unsigned long long utime_since_now(struct timeval *s)
+{
+       struct timeval t;
+
+       fio_gettime(&t, NULL);
+       return utime_since(s, &t);
+}
+
+unsigned long mtime_since(struct timeval *s, struct timeval *e)
+{
+       long sec, usec, ret;
+
+       sec = e->tv_sec - s->tv_sec;
+       usec = e->tv_usec - s->tv_usec;
+       if (sec > 0 && usec < 0) {
+               sec--;
+               usec += 1000000;
+       }
+
+       if (sec < 0 || (sec == 0 && usec < 0))
+               return 0;
+
+       sec *= 1000UL;
+       usec /= 1000UL;
+       ret = sec + usec;
+
+       return ret;
+}
+
+unsigned long mtime_since_now(struct timeval *s)
+{
+       struct timeval t;
+       void *p = __builtin_return_address(0);
+
+       fio_gettime(&t, p);
+       return mtime_since(s, &t);
 }
 
-void fio_gtod_update(void)
+unsigned long time_since_now(struct timeval *s)
 {
-       gettimeofday(fio_tv, NULL);
+       return mtime_since_now(s) / 1000;
 }