projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Parent options didn't recurse properly
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index 08ef078277ba125d43d1ce956db2ea92091e0793..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)
@@
-109,22
+123,34
@@
void usec_sleep(struct thread_data *td, unsigned long usec)
}
void rate_throttle(struct thread_data *td, unsigned long time_spent,
}
void rate_throttle(struct thread_data *td, unsigned long time_spent,
- unsigned int bytes
, int ddir
)
+ unsigned int bytes)
{
unsigned long usec_cycle;
{
unsigned long usec_cycle;
+ unsigned int bs;
- if (!td->
rate
)
+ if (!td->
o.rate && !td->o.rate_iops
)
return;
return;
- usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs[ddir]);
+ if (td_rw(td))
+ bs = td->o.rw_min_bs;
+ else if (td_read(td))
+ bs = td->o.min_bs[DDIR_READ];
+ else
+ bs = td->o.min_bs[DDIR_WRITE];
+
+ usec_cycle = td->rate_usec_cycle * (bytes / bs);
if (time_spent < usec_cycle) {
unsigned long s = usec_cycle - time_spent;
td->rate_pending_usleep += s;
if (time_spent < usec_cycle) {
unsigned long s = usec_cycle - time_spent;
td->rate_pending_usleep += s;
+
if (td->rate_pending_usleep >= 100000) {
if (td->rate_pending_usleep >= 100000) {
+ struct timeval t;
+
+ fio_gettime(&t, NULL);
usec_sleep(td, td->rate_pending_usleep);
usec_sleep(td, td->rate_pending_usleep);
- td->rate_pending_usleep
= 0
;
+ td->rate_pending_usleep
-= utime_since_now(&t)
;
}
} else {
long overtime = time_spent - usec_cycle;
}
} else {
long overtime = time_spent - usec_cycle;
@@
-142,8
+168,6
@@
static void fio_init time_init(void)
{
int i;
{
int i;
- fio_gettime(&genesis, NULL);
-
/*
* Check the granularity of the nanosleep function
*/
/*
* Check the granularity of the nanosleep function
*/
@@
-164,6
+188,11
@@
static void fio_init time_init(void)
}
}
}
}
+void set_genesis_time(void)
+{
+ fio_gettime(&genesis, NULL);
+}
+
void fill_start_time(struct timeval *t)
{
memcpy(t, &genesis, sizeof(genesis));
void fill_start_time(struct timeval *t)
{
memcpy(t, &genesis, sizeof(genesis));