projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing types to io_u_log_error()
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index 11ee0e07b94a5030cf79817fda5ce8609320bf81..7015fd51b4bccf69dbf6d7c34b45569eda87a67f 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-6,9
+6,10
@@
static struct timeval genesis;
static unsigned long ns_granularity;
static struct timeval genesis;
static unsigned long ns_granularity;
-unsigned long utime_since(struct timeval *s, struct timeval *e)
+unsigned long
long
utime_since(struct timeval *s, struct timeval *e)
{
long sec, usec;
{
long sec, usec;
+ unsigned long long 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,12
+18,18
@@
unsigned long utime_since(struct timeval *s, struct timeval *e)
usec += 1000000;
}
usec += 1000000;
}
- sec *= (double) 1000000;
+ /*
+ * time warp bug on some kernels?
+ */
+ if (sec < 0 || (sec == 0 && usec < 0))
+ return 0;
+
+ ret = sec * 1000000ULL + usec;
- return
sec + usec
;
+ return
ret
;
}
}
-unsigned long utime_since_now(struct timeval *s)
+unsigned long
long
utime_since_now(struct timeval *s)
{
struct timeval t;
{
struct timeval t;
@@
-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;
- return sec + usec;
+ /*
+ * time warp bug on some kernels?
+ */
+ if (ret < 0)
+ ret = 0;
+
+ return ret;
}
unsigned long mtime_since_now(struct timeval *s)
}
unsigned long mtime_since_now(struct timeval *s)
@@
-64,7
+78,7
@@
unsigned long time_since_now(struct timeval *s)
/*
* busy looping version for the last few usec
*/
/*
* busy looping version for the last few usec
*/
-void
__usec_sleep
(unsigned int usec)
+void
usec_spin
(unsigned int usec)
{
struct timeval start;
{
struct timeval start;
@@
-82,7
+96,7
@@
void usec_sleep(struct thread_data *td, unsigned long usec)
unsigned long ts = usec;
if (usec < ns_granularity) {
unsigned long ts = usec;
if (usec < ns_granularity) {
-
__usec_sleep
(usec);
+
usec_spin
(usec);
break;
}
break;
}
@@
-108,40
+122,40
@@
void usec_sleep(struct thread_data *td, unsigned long usec)
} while (!td->terminate);
}
} while (!td->terminate);
}
-void rate_throttle(struct thread_data *td, unsigned long time_spent,
- unsigned int bytes, int ddir)
+unsigned long mtime_since_genesis(void)
{
{
- unsigned long usec_cycle;
-
- if (!td->rate)
- return;
+ return mtime_since_now(&genesis);
+}
- usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs[ddir]);
+int in_ramp_time(struct thread_data *td)
+{
+ return td->o.ramp_time && !td->ramp_time_over;
+}
- if (time_spent < usec_cycle) {
- unsigned long s = usec_cycle - time_spent;
+int ramp_time_over(struct thread_data *td)
+{
+ struct timeval tv;
- td->rate_pending_usleep += s;
- if (td->rate_pending_usleep >= 100000) {
- usec_sleep(td, td->rate_pending_usleep);
- td->rate_pending_usleep = 0;
- }
- } else {
- long overtime = time_spent - usec_cycle;
+ if (!td->o.ramp_time || td->ramp_time_over)
+ return 1;
- td->rate_pending_usleep -= overtime;
+ fio_gettime(&tv, NULL);
+ if (mtime_since(&td->epoch, &tv) >= td->o.ramp_time * 1000) {
+ td->ramp_time_over = 1;
+ reset_all_stats(td);
+ td_set_runstate(td, TD_RAMP);
+ return 1;
}
}
-}
-unsigned long mtime_since_genesis(void)
-{
- return mtime_since_now(&genesis);
+ return 0;
}
}
-
static void fio_init
time_init(void)
+
void fio_init fio_
time_init(void)
{
int i;
{
int i;
+ fio_clock_init();
+
/*
* Check the granularity of the nanosleep function
*/
/*
* Check the granularity of the nanosleep function
*/