client/backend: fix incomplete output_format checks

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

diff --git a/backend.c b/backend.c
index 8fd55359b6e40ce97885c2e92ffdc0f998acfd33..b180196e4c4ec5b16d61120efaf14c9a2abdbf1f 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -1977,7 +1977,7 @@ static void run_threads(void)
                        nr_process++;
        }
 
-       if (output_format == FIO_OUTPUT_NORMAL) {
+       if (output_format & FIO_OUTPUT_NORMAL) {
                log_info("Starting ");
                if (nr_thread)
                        log_info("%d thread%s", nr_thread,

diff --git a/client.c b/client.c
index ed5fa4160b0d3c39594043c88c17878ff80b6cf2..db472c4cb0b4cb1d87368358b8bb34d65f78d94c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -117,7 +117,7 @@ static int read_data(int fd, void *data, size_t size)
 
 static void fio_client_json_init(void)
 {
-       if (output_format != FIO_OUTPUT_JSON)
+       if (!(output_format & FIO_OUTPUT_JSON))
                return;
        root = json_create_object();
        json_object_add_value_string(root, "fio version", fio_version_string);
@@ -129,7 +129,7 @@ static void fio_client_json_init(void)
 
 static void fio_client_json_fini(void)
 {
-       if (output_format != FIO_OUTPUT_JSON)
+       if (!(output_format & FIO_OUTPUT_JSON))
                return;
        json_print_object(root, NULL);
        log_info("\n");
@@ -1029,13 +1029,16 @@ static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
                log_info("\nDisk stats (read/write):\n");
        }
 
-       if (output_format == FIO_OUTPUT_JSON) {
+       if (output_format & FIO_OUTPUT_JSON) {
                struct json_object *duobj;
                json_array_add_disk_util(&du->dus, &du->agg, du_array);
                duobj = json_array_last_value_object(du_array);
                json_object_add_client_info(duobj, client);
-       } else
-               print_disk_util(&du->dus, &du->agg, output_format == FIO_OUTPUT_TERSE, NULL);
+       }
+       if (output_format & FIO_OUTPUT_TERSE)
+               print_disk_util(&du->dus, &du->agg, 1, NULL);
+       if (output_format & FIO_OUTPUT_NORMAL)
+               print_disk_util(&du->dus, &du->agg, 0, NULL);
 }
 
 static void convert_jobs_eta(struct jobs_eta *je)