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

[fio.git] / options.c

diff --git a/options.c b/options.c
index 3af604bd86f4d01ac2abd4d6394960bbd8af4a47..9d471bbdc8da612d9b5e3637a19eaa2f06d2368e 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1099,7 +1099,7 @@ static int str_steadystate_cb(void *data, const char *str)
                if (parse_dryrun())
                        return 0;
 
                if (parse_dryrun())
                        return 0;
 

-               td->o.ss_pct = true;
+               td->o.ss |= __FIO_SS_PCT;

                td->o.ss_limit.u.f = val;
        } else if (td->o.ss & __FIO_SS_IOPS) {
                if (!str_to_float(nr, &val, 0)) {
                td->o.ss_limit.u.f = val;
        } else if (td->o.ss & __FIO_SS_IOPS) {
                if (!str_to_float(nr, &val, 0)) {


@@ -1113,9 +1113,7 @@ static int str_steadystate_cb(void *data, const char *str)
                if (parse_dryrun())
                        return 0;
 
                if (parse_dryrun())
                        return 0;
 

-               td->o.ss_pct = false;

                td->o.ss_limit.u.f = val;
                td->o.ss_limit.u.f = val;

-

        } else {        /* bandwidth criterion */
                if (str_to_decimal(nr, &ll, 1, td, 0, 0)) {
                        log_err("fio: steadystate BW threshold postfix parsing failed\n");
        } else {        /* bandwidth criterion */
                if (str_to_decimal(nr, &ll, 1, td, 0, 0)) {
                        log_err("fio: steadystate BW threshold postfix parsing failed\n");


@@ -1128,9 +1126,7 @@ static int str_steadystate_cb(void *data, const char *str)
                if (parse_dryrun())
                        return 0;
 
                if (parse_dryrun())
                        return 0;
 

-               td->o.ss_pct = false;

                td->o.ss_limit.u.f = (double) ll;
                td->o.ss_limit.u.f = (double) ll;

-

        }
 
        td->ss.state = td->o.ss;
        }
 
        td->ss.state = td->o.ss;