log_info("...\n");
}
- if (o->ss_dur) {
- steadystate_enabled = true;
- o->ss_dur /= 1000000L;
-
- /* put all steady state info in one place */
- td->ss.dur = o->ss_dur;
- td->ss.limit = o->ss_limit.u.f;
- td->ss.ramp_time = o->ss_ramp_time;
- td->ss.pct = o->ss_pct;
-
- if (steadystate_check_slope(o))
- td->ss.check_slope = true;
- else
- td->ss.check_slope = false;
-
- if (o->ss == FIO_STEADYSTATE_IOPS || o->ss == FIO_STEADYSTATE_IOPS_SLOPE)
- td->ss.check_iops = true;
- else
- td->ss.check_iops = false;
-
- td->ss.bw_data = NULL;
- td->ss.iops_data = NULL;
- td->ss.ramp_time_over = (td->ss.ramp_time == 0);
- td->ss.attained = 0;
- td->ss.last_in_group = 0;
- td->ss.head = 0;
- td->ss.tail = 0;
- td->ss.sum_x = o->ss_dur * (o->ss_dur - 1) / 2;
- td->ss.sum_x_sq = (o->ss_dur - 1) * (o->ss_dur) * (2*o->ss_dur - 1) / 6;
- td->ss.prev_bytes = 0;
- td->ss.prev_iops = 0;
- td->ss.sum_y = 0;
- td->ss.oldest_y = 0;
- td->ss.criterion = 0.0;
- td->ss.slope = 0.0;
- td->ss.deviation = 0.0;
- td->ts.ss = &td->ss;
- } else
- td->ts.ss = NULL;
+ td_steadystate_init(td);
/*
* recurse add identical jobs, clear numjobs and stonewall options
char *pct;
long long ll;
- if (td->o.ss != FIO_STEADYSTATE_IOPS &&
- td->o.ss != FIO_STEADYSTATE_IOPS_SLOPE &&
- td->o.ss != FIO_STEADYSTATE_BW &&
- td->o.ss != FIO_STEADYSTATE_BW_SLOPE) {
+ if (td->o.ss != FIO_SS_IOPS && td->o.ss != FIO_SS_IOPS_SLOPE &&
+ td->o.ss != FIO_SS_BW && td->o.ss != FIO_SS_BW_SLOPE) {
/* should be impossible to get here */
log_err("fio: unknown steady state criterion\n");
return 1;
td->o.ss_pct = true;
td->o.ss_limit.u.f = val;
-
-
- } else if (td->o.ss == FIO_STEADYSTATE_IOPS ||
- td->o.ss == FIO_STEADYSTATE_IOPS_SLOPE) {
+ } else if (td->o.ss & __FIO_SS_IOPS) {
if (!str_to_float(nr, &val, 0)) {
log_err("fio: steadystate IOPS threshold postfix parsing failed\n");
free(nr);
}
+ td->ss.mode = td->o.ss;
return 0;
}
.def = "iops_slope:0.01%",
.posval = {
{ .ival = "iops",
- .oval = FIO_STEADYSTATE_IOPS,
+ .oval = FIO_SS_IOPS,
.help = "maximum mean deviation of IOPS measurements",
},
{ .ival = "iops_slope",
- .oval = FIO_STEADYSTATE_IOPS_SLOPE,
+ .oval = FIO_SS_IOPS_SLOPE,
.help = "slope calculated from IOPS measurements",
},
{ .ival = "bw",
- .oval = FIO_STEADYSTATE_BW,
+ .oval = FIO_SS_BW,
.help = "maximum mean deviation of bandwidth measurements",
},
{
.ival = "bw_slope",
- .oval = FIO_STEADYSTATE_BW_SLOPE,
+ .oval = FIO_SS_BW_SLOPE,
.help = "slope calculated from bandwidth measurements",
},
},
char ss_buf[64];
snprintf(ss_buf, sizeof(ss_buf), "%s%s:%f%s",
- ss->check_iops ? "iops" : "bw",
- ss->check_slope ? "_slope" : "",
+ ss->mode & __FIO_SS_IOPS ? "iops" : "bw",
+ ss->mode & __FIO_SS_SLOPE ? "_slope" : "",
(float) ss->limit,
ss->pct ? "%" : "");
bool steadystate_enabled = false;
+static void steadystate_alloc(struct thread_data *td)
+{
+ int i;
+
+ td->ss.bw_data = malloc(td->ss.dur * sizeof(unsigned long));
+ td->ss.iops_data = malloc(td->ss.dur * sizeof(unsigned long));
+ /* initialize so that it is obvious if the cache is not full in the output */
+ for (i = 0; i < td->ss.dur; i++)
+ td->ss.iops_data[i] = td->ss.bw_data[i] = 0;
+}
+
void steadystate_setup(void)
{
int i, prev_groupid;
}
}
-void steadystate_alloc(struct thread_data *td)
-{
- int i;
-
- td->ss.bw_data = malloc(td->ss.dur * sizeof(unsigned long));
- td->ss.iops_data = malloc(td->ss.dur * sizeof(unsigned long));
- /* initialize so that it is obvious if the cache is not full in the output */
- for (i = 0; i < td->ss.dur; i++)
- td->ss.iops_data[i] = td->ss.bw_data[i] = 0;
-}
-
static bool steadystate_slope(unsigned long iops, unsigned long bw,
struct thread_data *td)
{
ss->bw_data[ss->tail] = bw;
ss->iops_data[ss->tail] = iops;
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
new_val = iops;
else
new_val = bw;
if (ss->tail < ss->head || (ss->tail - ss->head == ss->dur - 1)) {
if (ss->sum_y == 0) { /* first time through */
for(i = 0; i < ss->dur; i++) {
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
ss->sum_y += ss->iops_data[i];
else
ss->sum_y += ss->bw_data[i];
j = ss->head + i;
if (j >= ss->dur)
j -= ss->dur;
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
ss->sum_xy += ss->iops_data[j];
else
ss->sum_xy += ss->bw_data[j];
ss->sum_xy = ss->sum_xy - ss->sum_y + ss->dur * new_val;
}
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
ss->oldest_y = ss->iops_data[ss->head];
else
ss->oldest_y = ss->bw_data[ss->head];
if (ss->tail < ss->head || (ss->tail - ss->head == ss->dur - 1)) {
if (ss->sum_y == 0) { /* first time through */
for(i = 0; i < ss->dur; i++)
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
ss->sum_y += ss->iops_data[i];
else
ss->sum_y += ss->bw_data[i];
} else { /* easy to update the sum */
ss->sum_y -= ss->oldest_y;
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
ss->sum_y += ss->iops_data[ss->tail];
else
ss->sum_y += ss->bw_data[ss->tail];
}
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
ss->oldest_y = ss->iops_data[ss->head];
else
ss->oldest_y = ss->bw_data[ss->head];
ss->deviation = 0.0;
for (i = 0; i < ss->dur; i++) {
- if (ss->check_iops)
+ if (ss->mode & __FIO_SS_IOPS)
diff = ss->iops_data[i] - mean;
else
diff = ss->bw_data[i] - mean;
i, td->groupid, rate_time, group_iops,
group_bw, ss->head, ss->tail);
- if (steadystate_check_slope(&td->o))
+ if (td->o.ss & __FIO_SS_SLOPE)
ret = steadystate_slope(group_iops, group_bw, td);
else
ret = steadystate_deviation(group_iops, group_bw, td);
}
}
+void td_steadystate_init(struct thread_data *td)
+{
+ struct steadystate_data *ss = &td->ss;
+ struct thread_options *o = &td->o;
+
+ memset(ss, 0, sizeof(*ss));
+
+ if (!o->ss_dur)
+ return;
+
+ 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;
+ ss->pct = o->ss_pct;
+ ss->mode = o->ss;
+
+ ss->ramp_time_over = (td->ss.ramp_time == 0);
+ 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;
+
+ td->ts.ss = ss;
+}
extern void steadystate_check(void);
extern void steadystate_setup(void);
-extern void steadystate_alloc(struct thread_data *);
+extern void td_steadystate_init(struct thread_data *);
extern bool steadystate_enabled;
double limit;
unsigned long long dur;
unsigned long long ramp_time;
- bool check_iops;
- bool check_slope;
bool pct;
+ unsigned int mode;
int attained;
int last_in_group;
int ramp_time_over;
};
enum {
- FIO_STEADYSTATE_IOPS = 0,
- FIO_STEADYSTATE_IOPS_SLOPE,
- FIO_STEADYSTATE_BW,
- FIO_STEADYSTATE_BW_SLOPE,
+ __FIO_SS_IOPS = 1,
+ __FIO_SS_BW = 2,
+ __FIO_SS_SLOPE = 4,
+
+ FIO_SS_IOPS = __FIO_SS_IOPS,
+ FIO_SS_IOPS_SLOPE = __FIO_SS_IOPS | __FIO_SS_SLOPE,
+ FIO_SS_BW = __FIO_SS_BW,
+ FIO_SS_BW_SLOPE = __FIO_SS_BW | __FIO_SS_SLOPE,
};
#define STEADYSTATE_MSEC 1000
-static inline bool steadystate_check_slope(struct thread_options *o)
-{
- return o->ss == FIO_STEADYSTATE_IOPS_SLOPE ||
- o->ss == FIO_STEADYSTATE_BW_SLOPE;
-}
-
-static inline bool steadystate_check_iops(struct thread_options *o)
-{
- return o->ss == FIO_STEADYSTATE_IOPS ||
- o->ss == FIO_STEADYSTATE_IOPS_SLOPE;
-}
-
#endif