Fix occasional hangs on mutexes

[fio.git] / time.c

diff --git a/time.c b/time.c
index f1833c7b9ea42d368c06eda180528d68db8e3c2c..0e64af55ff96b0a9179367f60ca8f3a7ae90f798 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
  */
@@ -80,6 +89,18 @@ 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;
@@ -92,6 +113,7 @@ int ramp_time_over(struct thread_data *td)
                td->ramp_time_over = 1;
                reset_all_stats(td);
                td_set_runstate(td, TD_RAMP);
+               parent_update_ramp(td);
                return 1;
        }