Add support for multiple output formats

[fio.git] / diskutil.c

diff --git a/diskutil.c b/diskutil.c
index 52d87f6433d85132b2ae2fd3e6bfdc127fc64393..bb68e8d3fc401ffeba28fd7afb85b68e85241cb9 100644 (file)
--- a/diskutil.c
+++ b/diskutil.c
@@ -704,21 +704,22 @@ void show_disk_util(int terse, struct json_object *parent)
                return;
        }
 
-       if (output_format == FIO_OUTPUT_JSON)
+       if (output_format & FIO_OUTPUT_JSON)
                assert(parent);
 
-       if (!terse && output_format != FIO_OUTPUT_JSON)
+       if (!terse && !(output_format & FIO_OUTPUT_JSON))
                log_info("\nDisk stats (read/write):\n");
 
-       if (output_format == FIO_OUTPUT_JSON)
+       if (output_format & FIO_OUTPUT_JSON)
                json_object_add_disk_utils(parent, &disk_list);
-       else
+       if (output_format & ~(FIO_OUTPUT_JSON)) {
                flist_for_each(entry, &disk_list) {
                        du = flist_entry(entry, struct disk_util, list);
 
                        aggregate_slaves_stats(du);
                        print_disk_util(&du->dus, &du->agg, terse);
                }
+       }
 
        fio_mutex_up(disk_util_mutex);
 }