From 966f8ef911a752782a086072a7cf2591b09d754e Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 20 Sep 2020 16:27:58 -0700 Subject: [PATCH] Change the return value of two functions from 'void' into 'int' This patch does not change any functionality but makes the next patch in this series easier to read. Signed-off-by: Bart Van Assche --- stat.c | 4 +++- stat.h | 2 +- steadystate.c | 3 ++- steadystate.h | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/stat.c b/stat.c index 7f987c7f..eb40bd7f 100644 --- a/stat.c +++ b/stat.c @@ -2299,7 +2299,7 @@ void __show_run_stats(void) free(opt_lists); } -void __show_running_run_stats(void) +int __show_running_run_stats(void) { struct thread_data *td; unsigned long long *rt; @@ -2350,6 +2350,8 @@ void __show_running_run_stats(void) free(rt); fio_sem_up(stat_sem); + + return 0; } static bool status_file_disabled; diff --git a/stat.h b/stat.h index 0d141666..6dd5ef74 100644 --- a/stat.h +++ b/stat.h @@ -319,7 +319,7 @@ extern void show_group_stats(struct group_run_stats *rs, struct buf_output *); extern bool calc_thread_status(struct jobs_eta *je, int force); extern void display_thread_status(struct jobs_eta *je); extern void __show_run_stats(void); -extern void __show_running_run_stats(void); +extern int __show_running_run_stats(void); extern void show_running_run_stats(void); extern void check_for_running_stats(void); extern void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, bool first); diff --git a/steadystate.c b/steadystate.c index bd2f70dd..2e3da1db 100644 --- a/steadystate.c +++ b/steadystate.c @@ -196,7 +196,7 @@ static bool steadystate_deviation(uint64_t iops, uint64_t bw, return false; } -void steadystate_check(void) +int steadystate_check(void) { int i, j, ddir, prev_groupid, group_ramp_time_over = 0; unsigned long rate_time; @@ -302,6 +302,7 @@ void steadystate_check(void) } } } + return 0; } int td_steadystate_init(struct thread_data *td) diff --git a/steadystate.h b/steadystate.h index 51472c46..bbb86fbb 100644 --- a/steadystate.h +++ b/steadystate.h @@ -4,7 +4,7 @@ #include "thread_options.h" extern void steadystate_free(struct thread_data *); -extern void steadystate_check(void); +extern int steadystate_check(void); extern void steadystate_setup(void); extern int td_steadystate_init(struct thread_data *); extern uint64_t steadystate_bw_mean(struct thread_stat *); -- 2.25.1