X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=1999969955b2828d6a9d38b425147b5ac3b5babf;hp=07984190d67a914173e1980f0ed0461b45ea5ee8;hb=7f125e7f3879d23e79bc2ef5eed678ddab3b5c70;hpb=d30455b5f301b9c8017a0c7439573835d7e177de diff --git a/time.c b/time.c index 07984190..19999699 100644 --- a/time.c +++ b/time.c @@ -97,16 +97,17 @@ bool 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) +static bool parent_update_ramp(struct thread_data *td) { struct thread_data *parent = td->parent; if (!parent || parent->ramp_time_over) - return; + return false; reset_all_stats(parent); - parent->ramp_time_over = 1; + parent->ramp_time_over = true; td_set_runstate(parent, TD_RAMP); + return true; } bool ramp_time_over(struct thread_data *td) @@ -115,10 +116,19 @@ bool ramp_time_over(struct thread_data *td) return true; if (utime_since_now(&td->epoch) >= td->o.ramp_time) { - td->ramp_time_over = 1; + td->ramp_time_over = true; reset_all_stats(td); + reset_io_stats(td); td_set_runstate(td, TD_RAMP); - parent_update_ramp(td); + + /* + * If we have a parent, the parent isn't doing IO. Hence + * the parent never enters do_io(), which will switch us + * from RAMP -> RUNNING. Do this manually here. + */ + if (parent_update_ramp(td)) + td_set_runstate(td, TD_RUNNING); + return true; }