fio: allow milliseconds on all time specifiers

[fio.git] / time.c

diff --git a/time.c b/time.c
index 80f8ca499f159f9e9473219c74480b89e6394652..b374d3e71eb976715a4ae86bd998f48108aec18d 100644 (file)
--- a/time.c
+++ b/time.c
@@ -6,65 +6,10 @@
 static struct timeval genesis;
 static unsigned long ns_granularity;
 
-unsigned long utime_since(struct timeval *s, struct timeval *e)
-{
-       long sec, usec;
-
-       sec = e->tv_sec - s->tv_sec;
-       usec = e->tv_usec - s->tv_usec;
-       if (sec > 0 && usec < 0) {
-               sec--;
-               usec += 1000000;
-       }
-
-       sec *= (double) 1000000;
-
-       return sec + usec;
-}
-
-unsigned long utime_since_now(struct timeval *s)
-{
-       struct timeval t;
-
-       fio_gettime(&t, NULL);
-       return utime_since(s, &t);
-}
-
-unsigned long mtime_since(struct timeval *s, struct timeval *e)
-{
-       long sec, usec;
-
-       sec = e->tv_sec - s->tv_sec;
-       usec = e->tv_usec - s->tv_usec;
-       if (sec > 0 && usec < 0) {
-               sec--;
-               usec += 1000000;
-       }
-
-       sec *= (double) 1000;
-       usec /= (double) 1000;
-
-       return sec + usec;
-}
-
-unsigned long mtime_since_now(struct timeval *s)
-{
-       struct timeval t;
-       void *p = __builtin_return_address(0);
-
-       fio_gettime(&t, p);
-       return mtime_since(s, &t);
-}
-
-unsigned long time_since_now(struct timeval *s)
-{
-       return mtime_since_now(s) / 1000;
-}
-
 /*
  * busy looping version for the last few usec
  */
-void __usec_sleep(unsigned int usec)
+void usec_spin(unsigned int usec)
 {
        struct timeval start;
 
@@ -82,7 +27,7 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
                unsigned long ts = usec;
 
                if (usec < ns_granularity) {
-                       __usec_sleep(usec);
+                       usec_spin(usec);
                        break;
                }
 
@@ -108,52 +53,40 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
        } while (!td->terminate);
 }
 
-void rate_throttle(struct thread_data *td, unsigned long time_spent,
-                  unsigned int bytes)
+uint64_t mtime_since_genesis(void)
 {
-       unsigned long usec_cycle;
-       unsigned int bs;
-
-       if (!td->rate && !td->rate_iops)
-               return;
-
-       if (td_rw(td))
-               bs = td->rw_min_bs;
-       else if (td_read(td))
-               bs = td->min_bs[DDIR_READ];
-       else
-               bs = td->min_bs[DDIR_WRITE];
-
-       usec_cycle = td->rate_usec_cycle * (bytes / bs);
-
-       if (time_spent < usec_cycle) {
-               unsigned long s = usec_cycle - time_spent;
+       return mtime_since_now(&genesis);
+}
 
-               td->rate_pending_usleep += s;
+int in_ramp_time(struct thread_data *td)
+{
+       return td->o.ramp_time && !td->ramp_time_over;
+}
 
-               if (td->rate_pending_usleep >= 100000) {
-                       struct timeval t;
+int ramp_time_over(struct thread_data *td)
+{
+       struct timeval tv;
 
-                       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;
+       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 ) {
+               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
         */