steadystate: add free helper

Also fix a style issue.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/backend.c b/backend.c
index 10eb90e2e7df06a9516fbab11b7b812e62e631e3..6c805c7f1e2b87cd23c6adb509de73d3698a2238 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -2480,12 +2480,7 @@ int fio_backend(struct sk_out *sk_out)
        }
 
        for_each_td(td, i) {
-               if (td->ss.dur) {
-                       if (td->ss.iops_data != NULL) {
-                               free(td->ss.iops_data);
-                               free(td->ss.bw_data);
-                       }
-               }
+               steadystate_free(td);
                fio_options_free(td);
                if (td->rusage_sem) {
                        fio_mutex_remove(td->rusage_sem);

diff --git a/helper_thread.c b/helper_thread.c
index 9c6e0a2b52da53adc495c6a478c9e5509a25880c..64e5a3c9d79277fe160065b9cab8f42a27ab78c6 100644 (file)
--- a/helper_thread.c
+++ b/helper_thread.c
@@ -134,8 +134,7 @@ static void *helper_thread_main(void *data)
                                        next_ss = STEADYSTATE_MSEC - (since_ss - STEADYSTATE_MSEC);
                                else
                                        next_ss = STEADYSTATE_MSEC;
-                       }
-                       else
+                       } else
                                next_ss = STEADYSTATE_MSEC - since_ss;
                 }
 

diff --git a/steadystate.c b/steadystate.c
index 05ce029924170cce0bd594fdfd94811d888fccad..d0abb47cb4416859cef952e2f804f760c5e1e24d 100644 (file)
--- a/steadystate.c
+++ b/steadystate.c
@@ -6,6 +6,14 @@
 
 bool steadystate_enabled = false;
 
+void steadystate_free(struct thread_data *td)
+{
+       free(td->ss.iops_data);
+       free(td->ss.bw_data);
+       td->ss.iops_data = NULL;
+       td->ss.bw_data = NULL;
+}
+
 static void steadystate_alloc(struct thread_data *td)
 {
        td->ss.bw_data = calloc(td->ss.dur, sizeof(uint64_t));

diff --git a/steadystate.h b/steadystate.h
index eaba0d7cad4876b22ddc037ffb278999b92fe73e..9fd88ee8cec4c2bad0c61e8c68e73b03d9358be5 100644 (file)
--- a/steadystate.h
+++ b/steadystate.h
@@ -5,6 +5,7 @@
 #include "thread_options.h"
 #include "lib/ieee754.h"
 
+extern void steadystate_free(struct thread_data *);
 extern void steadystate_check(void);
 extern void steadystate_setup(void);
 extern int td_steadystate_init(struct thread_data *);