plot: indicate that the pattern is a glob

[fio.git] / time.c

diff --git a/time.c b/time.c
index f1833c7b9ea42d368c06eda180528d68db8e3c2c..f1c5d3fe613e85c4ce0713701aee5c45afdcabdd 100644 (file)
--- a/time.c
+++ b/time.c
@@ -6,6 +6,15 @@
 static struct timeval genesis;
 static unsigned long ns_granularity;
 
+void timeval_add_msec(struct timeval *tv, unsigned int msec)
+{
+       tv->tv_usec += 1000 * msec;
+       if (tv->tv_usec >= 1000000) {
+               tv->tv_usec -= 1000000;
+               tv->tv_sec++;
+       }
+}
+
 /*
  * busy looping version for the last few usec
  */
@@ -75,27 +84,40 @@ uint64_t utime_since_genesis(void)
        return utime_since_now(&genesis);
 }
 
-int in_ramp_time(struct thread_data *td)
+bool in_ramp_time(struct thread_data *td)
 {
        return td->o.ramp_time && !td->ramp_time_over;
 }
 
-int ramp_time_over(struct thread_data *td)
+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);
+}
+
+bool ramp_time_over(struct thread_data *td)
 {
        struct timeval tv;
 
        if (!td->o.ramp_time || td->ramp_time_over)
-               return 1;
+               return true;
 
        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;
+               parent_update_ramp(td);
+               return true;
        }
 
-       return 0;
+       return false;
 }
 
 void fio_time_init(void)