Add a simple json encoder and use it to print fio output in json format

[fio.git] / init.c

diff --git a/init.c b/init.c
index 54ee1db6ebb43ae1a777eb5ecce5d5c05a9fc8ce..ca8047b09f29c8c127ce79407fff8aed725c01e4 100644 (file)
--- a/init.c
+++ b/init.c
@@ -116,6 +116,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
                .has_arg        = optional_argument,
                .val            = 'm' | FIO_CLIENT_FLAG,
        },
                .has_arg        = optional_argument,
                .val            = 'm' | FIO_CLIENT_FLAG,
        },

+       {
+               .name           = (char *) "json-output",
+               .has_arg        = optional_argument,
+               .val            = 'J' | FIO_CLIENT_FLAG,
+       },

        {
                .name           = (char *) "version",
                .has_arg        = no_argument,
        {
                .name           = (char *) "version",
                .has_arg        = no_argument,


@@ -1408,6 +1413,10 @@ int parse_cmd_line(int argc, char *argv[])
                case 'm':
                        terse_output = 1;
                        break;
                case 'm':
                        terse_output = 1;
                        break;

+               case 'J':
+                       terse_version = 4;
+                       terse_output = 1;
+                       break;

                case 'h':
                        if (!cur_client) {
                                usage(argv[0]);
                case 'h':
                        if (!cur_client) {
                                usage(argv[0]);


@@ -1439,9 +1448,10 @@ int parse_cmd_line(int argc, char *argv[])
                        }
                        break;
                case 'V':
                        }
                        break;
                case 'V':

+                       if (terse_version == 4)
+                               break;

                        terse_version = atoi(optarg);
                        terse_version = atoi(optarg);

-                       if (!(terse_version == 2 || terse_version == 3) ||
-                            (terse_version == 4)) {
+                       if (!(terse_version == 2 || terse_version == 3)) {

                                log_err("fio: bad terse version format\n");
                                exit_val = 1;
                                do_exit++;
                                log_err("fio: bad terse version format\n");
                                exit_val = 1;
                                do_exit++;