More random fixes

[fio.git] / time.c

diff --git a/time.c b/time.c
index c6a6287819e83b601ac0584db0b716e4dd6acec4..6d79ecdca3036515f89aa0df5bd9a38b4b7085f8 100644 (file)
--- a/time.c
+++ b/time.c
@@ -6,10 +6,11 @@
 static struct timeval genesis;
 static unsigned long ns_granularity;
 
-unsigned long utime_since(struct timeval *s, struct timeval *e)
+unsigned long long utime_since(struct timeval *s, struct timeval *e)
 {
        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) {
@@ -17,12 +18,18 @@ unsigned long utime_since(struct timeval *s, struct timeval *e)
                usec += 1000000;
        }
 
-       sec *= 1000000UL;
-
-       return sec + usec;
+       /*
+        * time warp bug on some kernels?
+        */
+       if (sec < 0 || (sec == 0 && usec < 0))
+               return 0;
+       
+       ret = sec * 1000000ULL + usec;
+       
+       return ret;
 }
 
-unsigned long utime_since_now(struct timeval *s)
+unsigned long long utime_since_now(struct timeval *s)
 {
        struct timeval t;
 
@@ -32,7 +39,7 @@ unsigned long utime_since_now(struct timeval *s)
 
 unsigned long mtime_since(struct timeval *s, struct timeval *e)
 {
-       long sec, usec;
+       long sec, usec, ret;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -43,8 +50,15 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
 
        sec *= 1000UL;
        usec /= 1000UL;
+       ret = sec + usec;
+
+       /*
+        * time warp bug on some kernels?
+        */
+       if (ret < 0)
+               ret = 0;
 
-       return sec + usec;
+       return ret;
 }
 
 unsigned long mtime_since_now(struct timeval *s)