projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow random overwrite workloads to write io_limit
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index c4d1d4c7c6ee5da1cac47011d0ccd86a1ae1e78a..f1833c7b9ea42d368c06eda180528d68db8e3c2c 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-9,25
+9,29
@@
static unsigned long ns_granularity;
/*
* busy looping version for the last few usec
*/
/*
* busy looping version for the last few usec
*/
-
void
usec_spin(unsigned int usec)
+
uint64_t
usec_spin(unsigned int usec)
{
struct timeval start;
{
struct timeval start;
+ uint64_t t;
fio_gettime(&start, NULL);
fio_gettime(&start, NULL);
- while (
utime_since_now(&start
) < usec)
+ while (
(t = utime_since_now(&start)
) < usec)
nop;
nop;
+
+ return t;
}
}
-
void
usec_sleep(struct thread_data *td, unsigned long usec)
+
uint64_t
usec_sleep(struct thread_data *td, unsigned long usec)
{
struct timespec req;
struct timeval tv;
{
struct timespec req;
struct timeval tv;
+ uint64_t t = 0;
do {
unsigned long ts = usec;
if (usec < ns_granularity) {
do {
unsigned long ts = usec;
if (usec < ns_granularity) {
- usec_spin(usec);
+
t +=
usec_spin(usec);
break;
}
break;
}
@@
-46,18
+50,31
@@
void usec_sleep(struct thread_data *td, unsigned long usec)
break;
ts = utime_since_now(&tv);
break;
ts = utime_since_now(&tv);
+ t += ts;
if (ts >= usec)
break;
usec -= ts;
} while (!td->terminate);
if (ts >= usec)
break;
usec -= ts;
} while (!td->terminate);
+
+ return t;
+}
+
+uint64_t time_since_genesis(void)
+{
+ return time_since_now(&genesis);
}
}
-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
+88,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);