X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=e0db19ba836286133d681b259b6c00afb4cd5aa1;hp=9d471bbdc8da612d9b5e3637a19eaa2f06d2368e;hb=2c5d94bc117583336b23e39c18ed3fd492f02eeb;hpb=0c13c9699c668990a18261141bab612598bc47d5 diff --git a/options.c b/options.c index 9d471bbd..e0db19ba 100644 --- a/options.c +++ b/options.c @@ -1069,8 +1069,8 @@ static int str_steadystate_cb(void *data, const char *str) char *pct; long long ll; - 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) { + if (td->o.ss_state != FIO_SS_IOPS && td->o.ss_state != FIO_SS_IOPS_SLOPE && + td->o.ss_state != FIO_SS_BW && td->o.ss_state != FIO_SS_BW_SLOPE) { /* should be impossible to get here */ log_err("fio: unknown steady state criterion\n"); return 1; @@ -1099,9 +1099,9 @@ static int str_steadystate_cb(void *data, const char *str) if (parse_dryrun()) return 0; - td->o.ss |= __FIO_SS_PCT; + td->o.ss_state |= __FIO_SS_PCT; td->o.ss_limit.u.f = val; - } else if (td->o.ss & __FIO_SS_IOPS) { + } else if (td->o.ss_state & __FIO_SS_IOPS) { if (!str_to_float(nr, &val, 0)) { log_err("fio: steadystate IOPS threshold postfix parsing failed\n"); free(nr); @@ -1129,7 +1129,7 @@ static int str_steadystate_cb(void *data, const char *str) td->o.ss_limit.u.f = (double) ll; } - td->ss.state = td->o.ss; + td->ss.state = td->o.ss_state; return 0; } @@ -4210,7 +4210,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .lname = "Steady state threshold", .alias = "ss", .type = FIO_OPT_STR, - .off1 = offsetof(struct thread_options, ss), + .off1 = offsetof(struct thread_options, ss_state), .cb = str_steadystate_cb, .help = "Define the criterion and limit to judge when a job has reached steady state", .def = "iops_slope:0.01%",