projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove early directory check
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index 108c0fcaab09e4b0a7d0bcfba8c6e690e83541de..505058f53b270f973482bdd839245d6239d69e99 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-6,9
+6,10
@@
static struct timeval genesis;
static unsigned long ns_granularity;
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;
{
long sec, usec;
+ unsigned long long ret;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
@@
-17,12
+18,18
@@
unsigned long utime_since(struct timeval *s, struct timeval *e)
usec += 1000000;
}
usec += 1000000;
}
- sec *= (double) 1000000;
+ /*
+ * time warp bug on some kernels?
+ */
+ if (sec < 0 || (sec == 0 && usec < 0))
+ return 0;
- return sec + usec;
+ 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;
{
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)
{
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;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
@@
-41,10
+48,17
@@
unsigned long mtime_since(struct timeval *s, struct timeval *e)
usec += 1000000;
}
usec += 1000000;
}
- sec *= (double) 1000;
- usec /= (double) 1000;
+ 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)
}
unsigned long mtime_since_now(struct timeval *s)