steadystate: get rid of ->ss_pct and encode this information in ->state via __FIO_SS_PCT

[fio.git] / steadystate.c

diff --git a/steadystate.c b/steadystate.c
index 235deac5854fb8a572a9321cb7508ae4fb7d3471..696ad164ac2fe159d180a7744d9b4d8a6fd0f323 100644 (file)
--- a/steadystate.c
+++ b/steadystate.c
@@ -43,7 +43,7 @@ void steadystate_setup(void)
 
                if (prev_groupid != td->groupid) {
                        if (prev_td != NULL) {
-                               prev_td->ss.state |= __FIO_SS_LAST;
+                               prev_td->ss.state |= __FIO_SS_DATA;
                                steadystate_alloc(prev_td);
                        }
                        prev_groupid = td->groupid;
@@ -52,7 +52,7 @@ void steadystate_setup(void)
        }
 
        if (prev_td != NULL && prev_td->o.group_reporting) {
-               prev_td->ss.state |= __FIO_SS_LAST;
+               prev_td->ss.state |= __FIO_SS_DATA;
                steadystate_alloc(prev_td);
        }
 }
@@ -84,9 +84,9 @@ static bool steadystate_slope(unsigned long iops, unsigned long bw,
                                if (j >= ss->dur)
                                        j -= ss->dur;
                                if (ss->state & __FIO_SS_IOPS)
-                                       ss->sum_xy += ss->iops_data[j];
+                                       ss->sum_xy += i * ss->iops_data[j];
                                else
-                                       ss->sum_xy += ss->bw_data[j];
+                                       ss->sum_xy += i * ss->bw_data[j];
                        }
                } else {                /* easy to update the sums */
                        ss->sum_y -= ss->oldest_y;
@@ -107,7 +107,7 @@ static bool steadystate_slope(unsigned long iops, unsigned long bw,
                 */
                ss->slope = (ss->sum_xy - (double) ss->sum_x * ss->sum_y / ss->dur) /
                                (ss->sum_x_sq - (double) ss->sum_x * ss->sum_x / ss->dur);
-               if (ss->pct)
+               if (ss->state & __FIO_SS_PCT)
                        ss->criterion = 100.0 * ss->slope / (ss->sum_y / ss->dur);
                else
                        ss->criterion = ss->slope;
@@ -172,7 +172,7 @@ static bool steadystate_deviation(unsigned long iops, unsigned long bw,
                        ss->deviation = max(ss->deviation, diff * (diff < 0.0 ? -1.0 : 1.0));
                }
 
-               if (ss->pct)
+               if (ss->state & __FIO_SS_PCT)
                        ss->criterion = 100.0 * ss->deviation / mean;
                else
                        ss->criterion = ss->deviation;
@@ -257,7 +257,7 @@ void steadystate_check(void)
                ss->prev_iops = td_iops;
                ss->prev_bytes = td_bytes;
 
-               if (td->o.group_reporting && !(ss->state & __FIO_SS_LAST))
+               if (td->o.group_reporting && !(ss->state & __FIO_SS_DATA))
                        continue;
 
                /*
@@ -294,31 +294,50 @@ void steadystate_check(void)
        }
 }
 
-void td_steadystate_init(struct thread_data *td)
+int td_steadystate_init(struct thread_data *td)
 {
        struct steadystate_data *ss = &td->ss;
        struct thread_options *o = &td->o;
+       struct thread_data *td2;
+       int j;
 
        memset(ss, 0, sizeof(*ss));
 
-       if (!o->ss_dur)
-               return;
+       if (o->ss_dur) {
+               steadystate_enabled = true;
+               o->ss_dur /= 1000000L;
+
+               /* put all steady state info in one place */
+               ss->dur = o->ss_dur;
+               ss->limit = o->ss_limit.u.f;
+               ss->ramp_time = o->ss_ramp_time;
 
-       steadystate_enabled = true;
-       o->ss_dur /= 1000000L;
+               ss->state = o->ss;
+               if (!td->ss.ramp_time)
+                       ss->state |= __FIO_SS_RAMP_OVER;
 
-       /* put all steady state info in one place */
-       ss->dur = o->ss_dur;
-       ss->limit = o->ss_limit.u.f;
-       ss->ramp_time = o->ss_ramp_time;
-       ss->pct = o->ss_pct;
+               ss->sum_x = o->ss_dur * (o->ss_dur - 1) / 2;
+               ss->sum_x_sq = (o->ss_dur - 1) * (o->ss_dur) * (2*o->ss_dur - 1) / 6;
 
-       ss->state = o->ss;
-       if (!td->ss.ramp_time)
-               ss->state |= __FIO_SS_RAMP_OVER;
+               td->ts.ss = ss;
+       }
 
-       ss->sum_x = o->ss_dur * (o->ss_dur - 1) / 2;
-       ss->sum_x_sq = (o->ss_dur - 1) * (o->ss_dur) * (2*o->ss_dur - 1) / 6;
+       /* make sure that ss options are consistent within reporting group */
+       for_each_td(td2, j) {
+               if (td2->groupid == td->groupid) {
+                       struct steadystate_data *ss2 = &td2->ss;
+
+                       if (ss2->dur != ss->dur ||
+                           ss2->limit != ss->limit ||
+                           ss2->ramp_time != ss->ramp_time ||
+                           ss2->state != ss->state ||
+                           ss2->sum_x != ss->sum_x ||
+                           ss2->sum_x_sq != ss->sum_x_sq) {
+                               td_verror(td, EINVAL, "job rejected: steadystate options must be consistent within reporting groups");
+                               return 1;
+                       }
+               }
+       }
 
-       td->ts.ss = ss;
+       return 0;
 }