projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile: exp/fixup-buggy-yacc-output is no more
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index c7f898be3db3a853b0328c742478c8657e41eda1..f3de3e71bd39ab52b8d625812751c8e9ce106c23 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-3,120
+3,121
@@
#include "fio.h"
#include "fio.h"
-unsigned long utime_since(struct timeval *s, struct timeval *e)
-{
- double sec, usec;
-
- sec = e->tv_sec - s->tv_sec;
- usec = e->tv_usec - s->tv_usec;
- if (sec > 0 && usec < 0) {
- sec--;
- usec += 1000000;
- }
+static struct timeval genesis;
+static unsigned long ns_granularity;
- sec *= (double) 1000000;
+/*
+ * busy looping version for the last few usec
+ */
+void usec_spin(unsigned int usec)
+{
+ struct timeval start;
- return sec + usec;
+ fio_gettime(&start, NULL);
+ while (utime_since_now(&start) < usec)
+ nop;
}
}
-
static unsigned long utime_since_now(struct timeval *s
)
+
void usec_sleep(struct thread_data *td, unsigned long usec
)
{
{
- struct timeval t;
+ struct timespec req;
+ struct timeval tv;
- gettimeofday(&t, NULL);
- return utime_since(s, &t);
-}
+ do {
+ unsigned long ts = usec;
-unsigned long mtime_since(struct timeval *s, struct timeval *e)
-{
- double sec, usec;
+ if (usec < ns_granularity) {
+ usec_spin(usec);
+ break;
+ }
- sec = e->tv_sec - s->tv_sec;
- usec = e->tv_usec - s->tv_usec;
- if (sec > 0 && usec < 0) {
- sec--;
- usec += 1000000;
- }
+ ts = usec - ns_granularity;
- sec *= (double) 1000;
- usec /= (double) 1000;
+ if (ts >= 1000000) {
+ req.tv_sec = ts / 1000000;
+ ts -= 1000000 * req.tv_sec;
+ } else
+ req.tv_sec = 0;
-
return sec + usec
;
-}
+
req.tv_nsec = ts * 1000
;
+ fio_gettime(&tv, NULL);
-unsigned long mtime_since_now(struct timeval *s)
-{
- struct timeval t;
+ if (nanosleep(&req, NULL) < 0)
+ break;
+
+ ts = utime_since_now(&tv);
+ if (ts >= usec)
+ break;
-
gettimeofday(&t, NULL)
;
-
return mtime_since(s, &t
);
+
usec -= ts
;
+
} while (!td->terminate
);
}
}
-u
nsigned long time_since_now(struct timeval *s
)
+u
int64_t mtime_since_genesis(void
)
{
{
- return mtime_since_now(
s) / 1000
;
+ return mtime_since_now(
&genesis)
;
}
}
-/*
- * busy looping version for the last few usec
- */
-void __usec_sleep(unsigned int usec)
+uint64_t utime_since_genesis(void)
{
{
- struct timeval start;
-
- gettimeofday(&start, NULL);
- while (utime_since_now(&start) < usec)
- nop;
+ return utime_since_now(&genesis);
}
}
-
void usec_sleep(struct thread_data *td, unsigned long usec
)
+
int in_ramp_time(struct thread_data *td
)
{
{
- struct timespec req, rem;
-
- req.tv_sec = usec / 1000000;
- req.tv_nsec = usec * 1000 - req.tv_sec * 1000000;
-
- do {
- if (usec < 5000) {
- __usec_sleep(usec);
- break;
- }
+ return td->o.ramp_time && !td->ramp_time_over;
+}
- rem.tv_sec = rem.tv_nsec = 0;
- if (nanosleep(&req, &rem) < 0)
-
break
;
+int ramp_time_over(struct thread_data *td)
+{
+
struct timeval tv
;
-
if ((rem.tv_sec + rem.tv_nsec) == 0
)
-
break
;
+
if (!td->o.ramp_time || td->ramp_time_over
)
+
return 1
;
- req.tv_nsec = rem.tv_nsec;
- req.tv_sec = rem.tv_sec;
+ fio_gettime(&tv, NULL);
+ 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);
+ return 1;
+ }
- usec = rem.tv_sec * 1000000 + rem.tv_nsec / 1000;
- } while (!td->terminate);
+ return 0;
}
}
-void rate_throttle(struct thread_data *td, unsigned long time_spent,
- unsigned int bytes)
+void fio_time_init(void)
{
{
-
unsigned long usec_cycle
;
+
int i
;
- if (!td->rate)
- return;
+ fio_clock_init();
- usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs);
+ /*
+ * Check the granularity of the nanosleep function
+ */
+ for (i = 0; i < 10; i++) {
+ struct timeval tv;
+ struct timespec ts;
+ unsigned long elapsed;
- if (time_spent < usec_cycle) {
- unsigned long s = usec_cycle - time_spent;
+ fio_gettime(&tv, NULL);
+ ts.tv_sec = 0;
+ ts.tv_nsec = 1000;
- 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;
+ nanosleep(&ts, NULL);
+ elapsed = utime_since_now(&tv);
- td->rate_pending_usleep -= overtime;
+ if (elapsed > ns_granularity)
+ ns_granularity = elapsed;
}
}
}
}
+
+void set_genesis_time(void)
+{
+ fio_gettime(&genesis, NULL);
+}
+
+void fill_start_time(struct timeval *t)
+{
+ memcpy(t, &genesis, sizeof(genesis));
+}