client: cleanup json output

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

diff --git a/client.c b/client.c
index 35cbf68cfa82860507ba12f616c27207a926f796..c24f89b4673463628af0bed90c6bd6cc1a7b8f1c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -119,6 +119,7 @@ static void fio_client_json_init(void)
 {
        if (!(output_format & FIO_OUTPUT_JSON))
                return;
 {
        if (!(output_format & FIO_OUTPUT_JSON))
                return;

+

        root = json_create_object();
        json_object_add_value_string(root, "fio version", fio_version_string);
        clients_array = json_create_array();
        root = json_create_object();
        json_object_add_value_string(root, "fio version", fio_version_string);
        clients_array = json_create_array();


@@ -131,6 +132,7 @@ static void fio_client_json_fini(void)
 {
        if (!(output_format & FIO_OUTPUT_JSON))
                return;
 {
        if (!(output_format & FIO_OUTPUT_JSON))
                return;

+       log_info("\n");

        json_print_object(root, NULL);
        log_info("\n");
        json_free_object(root);
        json_print_object(root, NULL);
        log_info("\n");
        json_free_object(root);


@@ -968,7 +970,8 @@ 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;
 

-       show_group_stats(gs, NULL);
+       if (output_format & FIO_OUTPUT_NORMAL)
+               show_group_stats(gs, NULL);

 }
 
 static void handle_text(struct fio_client *client, struct fio_net_cmd *cmd)
 }
 
 static void handle_text(struct fio_client *client, struct fio_net_cmd *cmd)