X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=c4d1d4c7c6ee5da1cac47011d0ccd86a1ae1e78a;hp=4af84bc7cc5b6a2e1f0be57f284e3e6c3d57f2c8;hb=39ab7da23768081db50b0026e0c2a8e38752e7a4;hpb=f98f3d076502dfd18a2d1b63443288cab356a983 diff --git a/time.c b/time.c index 4af84bc7..c4d1d4c7 100644 --- a/time.c +++ b/time.c @@ -6,72 +6,6 @@ static struct timeval genesis; static unsigned long ns_granularity; -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) { - 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); -} - -unsigned long time_since_now(struct timeval *s) -{ - return mtime_since_now(s) / 1000; -} - /* * busy looping version for the last few usec */