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, ret;
+ long sec, usec;
+ unsigned long long ret;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
usec += 1000000;
}
- sec *= 1000000UL;
- ret = sec + usec;
-
/*
* time warp bug on some kernels?
*/
- if (ret < 0)
- ret = 0;
+ if (sec < 0 || (sec == 0 && usec < 0))
+ return 0;
+
+ ret = sec * 1000000ULL + usec;
return ret;
}
-unsigned long utime_since_now(struct timeval *s)
+unsigned long long utime_since_now(struct timeval *s)
{
struct timeval t;
usec += 1000000;
}
+ if (sec < 0 || (sec == 0 && usec < 0))
+ return 0;
+
sec *= 1000UL;
usec /= 1000UL;
ret = sec + usec;
- /*
- * time warp bug on some kernels?
- */
- if (ret < 0)
- ret = 0;
-
return ret;
}
/*
* busy looping version for the last few usec
*/
-void __usec_sleep(unsigned int usec)
+void usec_spin(unsigned int usec)
{
struct timeval start;
unsigned long ts = usec;
if (usec < ns_granularity) {
- __usec_sleep(usec);
+ usec_spin(usec);
break;
}
} while (!td->terminate);
}
-void rate_throttle(struct thread_data *td, unsigned long time_spent,
- unsigned int bytes)
+unsigned long mtime_since_genesis(void)
{
- unsigned long usec_cycle;
- unsigned int bs;
-
- if (!td->o.rate && !td->o.rate_iops)
- return;
-
- 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);
+ return mtime_since_now(&genesis);
+}
- if (time_spent < usec_cycle) {
- unsigned long s = usec_cycle - time_spent;
+int in_ramp_time(struct thread_data *td)
+{
+ return td->o.ramp_time && !td->ramp_time_over;
+}
- td->rate_pending_usleep += s;
+int ramp_time_over(struct thread_data *td)
+{
+ struct timeval tv;
- if (td->rate_pending_usleep >= 100000) {
- struct timeval t;
+ if (!td->o.ramp_time || td->ramp_time_over)
+ return 1;
- fio_gettime(&t, NULL);
- usec_sleep(td, td->rate_pending_usleep);
- td->rate_pending_usleep -= utime_since_now(&t);
- }
- } else {
- long overtime = time_spent - usec_cycle;
-
- 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_time_init(void)
{
int i;
+ fio_clock_init();
+
/*
* Check the granularity of the nanosleep function
*/