eta: use bool for forcing jobs_eta return

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

diff --git a/eta.c b/eta.c
index 4362ffe39e38bb4a58c883cedf45c553b1018f64..ffab34e2c740c8d38ac3c808a062013f6c0c1abd 100644 (file)
--- 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 4d4c2f28a539b32b958af8140c4739d43f4b94f9..cf01733bd015f767c4c279b9b54d6fd5ed2ec05b 100644 (file)
--- 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 818756dd8537d3385995ae817a7815f57c0c3008..ca066175d94243f51d7bd2773f0de1b4982c1fa1 100644 (file)
--- 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 33afd9b845b95a2283622f3a8661ff20eaef303f..dda88fcd782266cc5643423b2e7651f584188ca7 100644 (file)
--- 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);