steadystate: rename 'steadystate' to 'steadystate_enabled'

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/fio.h b/fio.h
index d099da82e2653de7c9ad6a501532e1709614d742..aca5afa7c0d91f36a1820156c4afd8fd76a92443 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -472,9 +472,6 @@ extern char *trigger_remote_cmd;
 extern long long trigger_timeout;
 extern char *aux_path;
 
-extern bool steadystate;
-#define STEADYSTATE_MSEC (1000)
-
 extern struct thread_data *threads;
 
 static inline void fio_ro_check(const struct thread_data *td, struct io_u *io_u)

diff --git a/helper_thread.c b/helper_thread.c
index f88e781ab12b4194d9e20684066a86e37fefd243..47ec728cfa31d25f68742af81178bb95f3e5f928 100644 (file)
--- a/helper_thread.c
+++ b/helper_thread.c
@@ -125,7 +125,7 @@ static void *helper_thread_main(void *data)
                if (!next_log)
                        next_log = DISK_UTIL_MSEC;
 
-               if (steadystate) {
+               if (steadystate_enabled) {
                        since_ss = mtime_since(&last_ss, &now);
                        if (since_ss >= STEADYSTATE_MSEC || STEADYSTATE_MSEC - since_ss < 10) {
                                steadystate_check();

diff --git a/init.c b/init.c
index 9113865027528f56b1d546c2f29a031c011943db..64119eb2d5f173ca09bcc0c16647b98636f1c553 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1579,7 +1579,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
        }
 
        if (o->ss_dur) {
-               steadystate = true;
+               steadystate_enabled = true;
                o->ss_dur /= 1000000L;
 
                /* put all steady state info in one place */

diff --git a/steadystate.c b/steadystate.c
index 53d303428eae6861fb9899edbaa9d24000eff63b..528e95259e36cc050cbdcfdd760941790f733195 100644 (file)
--- a/steadystate.c
+++ b/steadystate.c
@@ -4,14 +4,14 @@
 #include "steadystate.h"
 #include "helper_thread.h"
 
-bool steadystate = false;
+bool steadystate_enabled = false;
 
 void steadystate_setup(void)
 {
        int i, prev_groupid;
        struct thread_data *td, *prev_td;
 
-       if (!steadystate)
+       if (!steadystate_enabled)
                return;
 
        /*

diff --git a/steadystate.h b/steadystate.h
index aa31112bf5163ef3784c1266f5f962c7044057e9..5342b2cd283844b9cd63bb860582e38303eeef67 100644 (file)
--- a/steadystate.h
+++ b/steadystate.h
@@ -7,7 +7,7 @@ extern void steadystate_check(void);
 extern void steadystate_setup(void);
 extern void steadystate_alloc(struct thread_data *);
 
-extern bool steadystate;
+extern bool steadystate_enabled;
 
 /*
  * For steady state detection
@@ -51,6 +51,8 @@ enum {
        FIO_STEADYSTATE_BW_SLOPE,
 };
 
+#define STEADYSTATE_MSEC       1000
+
 static inline bool steadystate_check_slope(struct thread_options *o)
 {
        return o->ss == FIO_STEADYSTATE_IOPS_SLOPE ||