Revert "client: respect terse output on client <--> backend relationship"

This breaks a standard use case, which is a server without arguments
and a client with the --minimal option.

This reverts commit 1d1b65dc17c39f43dbe9d66062ca61fc3e90ddfc.

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

diff --git a/client.c b/client.c
index b2fef2ad467baeb68ec43dcfad7439998d4a5b5d..f7726f7469c75fc54b2c9f06ff27c5d26278836e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1059,9 +1059,6 @@ static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd)
        struct flist_head *opt_list = NULL;
        struct json_object *tsobj;
 
        struct flist_head *opt_list = NULL;
        struct json_object *tsobj;
 

-       if (output_format & FIO_OUTPUT_TERSE)
-               return;
-

        if (client->opt_lists && p->ts.thread_number <= client->jobs)
                opt_list = &client->opt_lists[p->ts.thread_number - 1];
 
        if (client->opt_lists && p->ts.thread_number <= client->jobs)
                opt_list = &client->opt_lists[p->ts.thread_number - 1];
 


@@ -1098,9 +1095,6 @@ static void handle_gs(struct fio_client *client, struct fio_net_cmd *cmd)
 {
        struct group_run_stats *gs = (struct group_run_stats *) cmd->payload;
 
 {
        struct group_run_stats *gs = (struct group_run_stats *) cmd->payload;
 

-       if (output_format & FIO_OUTPUT_TERSE)
-               return;
-

        if (output_format & FIO_OUTPUT_NORMAL)
                show_group_stats(gs, NULL);
 }
        if (output_format & FIO_OUTPUT_NORMAL)
                show_group_stats(gs, NULL);
 }


@@ -1195,9 +1189,6 @@ static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
 {
        struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload;
 
 {
        struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload;
 

-       if (output_format & FIO_OUTPUT_TERSE)
-               return;
-

        if (!client->disk_stats_shown) {
                client->disk_stats_shown = true;
                if (!(output_format & FIO_OUTPUT_JSON))
        if (!client->disk_stats_shown) {
                client->disk_stats_shown = true;
                if (!(output_format & FIO_OUTPUT_JSON))


@@ -1210,6 +1201,8 @@ static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
                duobj = json_array_last_value_object(du_array);
                json_object_add_client_info(duobj, client);
        }
                duobj = json_array_last_value_object(du_array);
                json_object_add_client_info(duobj, client);
        }

+       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);
 }
        if (output_format & FIO_OUTPUT_NORMAL)
                print_disk_util(&du->dus, &du->agg, 0, NULL);
 }


@@ -1469,9 +1462,6 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
        const char *os, *arch;
        char bit[16];
 
        const char *os, *arch;
        char bit[16];
 

-       if (output_format & FIO_OUTPUT_TERSE)
-               return;
-

        os = fio_get_os_string(probe->os);
        if (!os)
                os = "unknown";
        os = fio_get_os_string(probe->os);
        if (!os)
                os = "unknown";

diff --git a/stat.c b/stat.c
index 1a9c553b12b744d72a1f25c28f6b7f1f53accfa0..5fca99845ff88d10b9c4b96d1b76b37672170349 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -1928,8 +1928,6 @@ void __show_run_stats(void)
                if (is_backend) {
                        fio_server_send_job_options(opt_lists[i], i);
                        fio_server_send_ts(ts, rs);
                if (is_backend) {
                        fio_server_send_job_options(opt_lists[i], i);
                        fio_server_send_ts(ts, rs);

-                       if (output_format & FIO_OUTPUT_TERSE)
-                               show_thread_status_terse(ts, rs, &output[__FIO_OUTPUT_TERSE]);

                } else {
                        if (output_format & FIO_OUTPUT_TERSE)
                                show_thread_status_terse(ts, rs, &output[__FIO_OUTPUT_TERSE]);
                } else {
                        if (output_format & FIO_OUTPUT_TERSE)
                                show_thread_status_terse(ts, rs, &output[__FIO_OUTPUT_TERSE]);