projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't crash when using filehash lock before init
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index c4d1d4c7c6ee5da1cac47011d0ccd86a1ae1e78a..f3de3e71bd39ab52b8d625812751c8e9ce106c23 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-53,11
+53,16
@@
void usec_sleep(struct thread_data *td, unsigned long usec)
} while (!td->terminate);
}
} while (!td->terminate);
}
-u
nsigned long
mtime_since_genesis(void)
+u
int64_t
mtime_since_genesis(void)
{
return mtime_since_now(&genesis);
}
{
return mtime_since_now(&genesis);
}
+uint64_t utime_since_genesis(void)
+{
+ return utime_since_now(&genesis);
+}
+
int in_ramp_time(struct thread_data *td)
{
return td->o.ramp_time && !td->ramp_time_over;
int in_ramp_time(struct thread_data *td)
{
return td->o.ramp_time && !td->ramp_time_over;
@@
-71,7
+76,7
@@
int ramp_time_over(struct thread_data *td)
return 1;
fio_gettime(&tv, NULL);
return 1;
fio_gettime(&tv, NULL);
- if (
mtime_since(&td->epoch, &tv) >= td->o.ramp_time * 1000
) {
+ if (
utime_since(&td->epoch, &tv) >= td->o.ramp_time
) {
td->ramp_time_over = 1;
reset_all_stats(td);
td_set_runstate(td, TD_RAMP);
td->ramp_time_over = 1;
reset_all_stats(td);
td_set_runstate(td, TD_RAMP);