Fix ramp time for io_submit_mode=offload

[fio.git] / time.c

diff --git a/time.c b/time.c
index 17f9f6fcd187b69feda17140ba62928d7a8f4914..b145e90e2da2fe2c4fa7e44100451f5c9434fabc 100644 (file)
--- a/time.c
+++ b/time.c
@@ -9,25 +9,29 @@ static unsigned long ns_granularity;
 /*
  * busy looping version for the last few usec
  */
-void usec_spin(unsigned int usec)
+uint64_t usec_spin(unsigned int usec)
 {
        struct timeval start;
+       uint64_t t;
 
        fio_gettime(&start, NULL);
-       while (utime_since_now(&start) < usec)
+       while ((t = utime_since_now(&start)) < usec)
                nop;
+
+       return t;
 }
 
-void usec_sleep(struct thread_data *td, unsigned long usec)
+uint64_t usec_sleep(struct thread_data *td, unsigned long usec)
 {
        struct timespec req;
        struct timeval tv;
+       uint64_t t = 0;
 
        do {
                unsigned long ts = usec;
 
                if (usec < ns_granularity) {
-                       usec_spin(usec);
+                       t += usec_spin(usec);
                        break;
                }
 
@@ -46,11 +50,19 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
                        break;
 
                ts = utime_since_now(&tv);
+               t += ts;
                if (ts >= usec)
                        break;
 
                usec -= ts;
        } while (!td->terminate);
+
+       return t;
+}
+
+uint64_t time_since_genesis(void)
+{
+       return time_since_now(&genesis);
 }
 
 uint64_t mtime_since_genesis(void)
@@ -58,11 +70,28 @@ uint64_t mtime_since_genesis(void)
        return mtime_since_now(&genesis);
 }
 
+uint64_t utime_since_genesis(void)
+{
+       return utime_since_now(&genesis);
+}
+
 int in_ramp_time(struct thread_data *td)
 {
        return td->o.ramp_time && !td->ramp_time_over;
 }
 
+static void parent_update_ramp(struct thread_data *td)
+{
+       struct thread_data *parent = td->parent;
+
+       if (!parent || parent->ramp_time_over)
+               return;
+
+       reset_all_stats(parent);
+       parent->ramp_time_over = 1;
+       td_set_runstate(parent, TD_RAMP);
+}
+
 int ramp_time_over(struct thread_data *td)
 {
        struct timeval tv;
@@ -71,10 +100,11 @@ int ramp_time_over(struct thread_data *td)
                return 1;
 
        fio_gettime(&tv, NULL);
-       if (mtime_since(&td->epoch, &tv) >= td->o.ramp_time * 1000) {
+       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);
+               parent_update_ramp(td);
                return 1;
        }