projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix size given larger than filesize given
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index 80f8ca499f159f9e9473219c74480b89e6394652..4fbc98bbc57f8b781d95c7a8362ce8b8ab348700 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-8,7
+8,7
@@
static unsigned long ns_granularity;
unsigned long utime_since(struct timeval *s, struct timeval *e)
{
unsigned long utime_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;
@@
-17,9
+17,16
@@
unsigned long utime_since(struct timeval *s, struct timeval *e)
usec += 1000000;
}
usec += 1000000;
}
- sec *= (double) 1000000;
+ sec *= 1000000UL;
+ ret = sec + usec;
- return sec + usec;
+ /*
+ * time warp bug on some kernels?
+ */
+ if (ret < 0)
+ ret = 0;
+
+ return ret;
}
unsigned long utime_since_now(struct timeval *s)
}
unsigned long utime_since_now(struct timeval *s)
@@
-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)
@@
-114,15
+128,15
@@
void rate_throttle(struct thread_data *td, unsigned long time_spent,
unsigned long usec_cycle;
unsigned int bs;
unsigned long usec_cycle;
unsigned int bs;
- if (!td->
rate && !td->
rate_iops)
+ if (!td->
o.rate && !td->o.
rate_iops)
return;
if (td_rw(td))
return;
if (td_rw(td))
- bs = td->rw_min_bs;
+ bs = td->
o.
rw_min_bs;
else if (td_read(td))
else if (td_read(td))
- bs = td->min_bs[DDIR_READ];
+ bs = td->
o.
min_bs[DDIR_READ];
else
else
- bs = td->min_bs[DDIR_WRITE];
+ bs = td->
o.
min_bs[DDIR_WRITE];
usec_cycle = td->rate_usec_cycle * (bytes / bs);
usec_cycle = td->rate_usec_cycle * (bytes / bs);