From c5103619279883ee9291ed4793bb6ad39b436101 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 9 Dec 2015 12:44:09 -0700 Subject: [PATCH] eta: use bool for forcing jobs_eta return Signed-off-by: Jens Axboe --- eta.c | 4 ++-- server.c | 2 +- stat.c | 2 +- stat.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eta.c b/eta.c index 4362ffe3..ffab34e2 100644 --- a/eta.c +++ b/eta.c @@ -589,7 +589,7 @@ void display_thread_status(struct jobs_eta *je) fflush(stdout); } -struct jobs_eta *get_jobs_eta(int force, size_t *size) +struct jobs_eta *get_jobs_eta(bool force, size_t *size) { struct jobs_eta *je; @@ -616,7 +616,7 @@ void print_thread_status(void) struct jobs_eta *je; size_t size; - je = get_jobs_eta(0, &size); + je = get_jobs_eta(false, &size); if (je) display_thread_status(je); diff --git a/server.c b/server.c index 4d4c2f28..cf01733b 100644 --- a/server.c +++ b/server.c @@ -715,7 +715,7 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd) * Fake ETA return if we don't have a local one, otherwise the client * will end up timing out waiting for a response to the ETA request */ - je = get_jobs_eta(1, &size); + je = get_jobs_eta(true, &size); if (!je) { size = sizeof(*je); je = calloc(1, size); diff --git a/stat.c b/stat.c index 818756dd..ca066175 100644 --- a/stat.c +++ b/stat.c @@ -1104,7 +1104,7 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts, json_object_add_value_int(root, "error", ts->error); /* ETA Info */ - je = get_jobs_eta(1, &size); + je = get_jobs_eta(true, &size); if (je) { json_object_add_value_int(root, "eta", je->eta_sec); json_object_add_value_int(root, "elapsed", je->elapsed_sec); diff --git a/stat.h b/stat.h index 33afd9b8..dda88fcd 100644 --- a/stat.h +++ b/stat.h @@ -242,7 +242,7 @@ struct jobs_eta { extern struct fio_mutex *stat_mutex; -extern struct jobs_eta *get_jobs_eta(int force, size_t *size); +extern struct jobs_eta *get_jobs_eta(bool force, size_t *size); extern void stat_init(void); extern void stat_exit(void); -- 2.25.1