Add terse version 2 output format

[fio.git] / init.c

diff --git a/init.c b/init.c
index c4d6a1ee150860de95c322d945a9731a519d181c..b41273181cd5fb6bc8e41941d6267b64975868ee 100644 (file)
--- a/init.c
+++ b/init.c
@@ -23,12 +23,14 @@
 
 #include "lib/getopt.h"
 
+#include "fio_version.h"
+
 #if FIO_PATCH > 0
-static char fio_version_string[] =     __fio_stringify(FIO_MAJOR) "."  \
+const char fio_version_string[] =      __fio_stringify(FIO_MAJOR) "."  \
                                        __fio_stringify(FIO_MINOR) "."  \
                                        __fio_stringify(FIO_PATCH);
 #else
-static char fio_version_string[] =     __fio_stringify(FIO_MAJOR) "."  \
+const char fio_version_string[] =      __fio_stringify(FIO_MAJOR) "."  \
                                        __fio_stringify(FIO_MINOR);
 #endif
 
@@ -52,7 +54,7 @@ char **job_sections = NULL;
 int nr_job_sections = 0;
 char *exec_profile = NULL;
 int warnings_fatal = 0;
-int terse_version = 2;
+int terse_version = 3;
 int is_backend = 0;
 int nr_clients = 0;
 int log_syslog = 0;
@@ -69,6 +71,7 @@ unsigned int fio_debug_jobno = -1;
 unsigned int *fio_debug_jobp = NULL;
 
 static char cmd_optstr[256];
+static int did_arg;
 
 const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = {
        { .u.f  =  1.0 },
@@ -187,17 +190,12 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
        },
        {
                .name           = (char *) "server",
-               .has_arg        = no_argument,
+               .has_arg        = optional_argument,
                .val            = 'S',
        },
        {       .name           = (char *) "daemonize",
-               .has_arg        = no_argument,
-               .val            = 'D',
-       },
-       {
-               .name           = (char *) "net-port",
                .has_arg        = required_argument,
-               .val            = 'P',
+               .val            = 'D',
        },
        {
                .name           = (char *) "client",
@@ -320,6 +318,8 @@ static void put_job(struct thread_data *td)
        if (td->error)
                log_info("fio: %s\n", td->verror);
 
+       fio_options_free(td);
+
        memset(&threads[td->thread_number - 1], 0, sizeof(*td));
        thread_number--;
 }
@@ -964,7 +964,7 @@ int parse_jobs_ini(char *file, int is_buf, int stonewall_flag)
                        if (is_buf)
                                p = strsep(&file, "\n");
                        else
-                               p = fgets(string, 4095, f);
+                               p = fgets(string, 4096, f);
                        if (!p)
                                break;
                }
@@ -1072,6 +1072,12 @@ int parse_jobs_ini(char *file, int is_buf, int stonewall_flag)
        if (dump_cmdline)
                log_info("\n");
 
+       i = 0;
+       while (i < nr_job_sections) {
+               free(job_sections[i]);
+               i++;
+       }
+
        for (i = 0; i < num_opts; i++)
                free(opts[i]);
 
@@ -1099,7 +1105,7 @@ static int fill_def_thread(void)
 
 static void usage(const char *name)
 {
-       printf("%s\n", fio_version_string);
+       printf("fio %s\n", fio_version_string);
        printf("%s [options] [job options] <job file(s)>\n", name);
        printf("\t--debug=options\tEnable debug logging\n");
        printf("\t--output\tWrite output to file\n");
@@ -1122,9 +1128,9 @@ static void usage(const char *name)
                " (def 1024)\n");
        printf("\t--warnings-fatal Fio parser warnings are fatal\n");
        printf("\t--max-jobs\tMaximum number of threads/processes to support\n");
-       printf("\t--server\tStart a backend fio server\n");
-       printf("\t--client=hostname Talk to remove backend fio server at hostname\n");
-       printf("\t--net-port=port\tUse specified port for client/server connection\n");
+       printf("\t--server=args\tStart a backend fio server\n");
+       printf("\t--daemonize=pidfile Background fio server, write pid to file\n");
+       printf("\t--client=hostname Talk to remote backend fio server at hostname\n");
        printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
        printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");
 }
@@ -1246,9 +1252,9 @@ static int client_flag_set(char c)
        return 0;
 }
 
-int parse_cmd_client(char *client, char *opt)
+void parse_cmd_client(void *client, char *opt)
 {
-       return fio_client_add_cmd_option(client, opt);
+       fio_client_add_cmd_option(client, opt);
 }
 
 int parse_cmd_line(int argc, char *argv[])
@@ -1256,8 +1262,8 @@ int parse_cmd_line(int argc, char *argv[])
        struct thread_data *td = NULL;
        int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
        char *ostr = cmd_optstr;
-       int daemonize_server = 0;
-       char *cur_client = NULL;
+       void *pid_file = NULL;
+       void *cur_client = NULL;
        int backend = 0;
 
        /*
@@ -1267,12 +1273,10 @@ int parse_cmd_line(int argc, char *argv[])
        optind = 1;
 
        while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
+               did_arg = 1;
+
                if ((c & FIO_CLIENT_FLAG) || client_flag_set(c)) {
-                       if (parse_cmd_client(cur_client, argv[optind - 1])) {
-                               exit_val = 1;
-                               do_exit++;
-                               break;
-                       }
+                       parse_cmd_client(cur_client, argv[optind - 1]);
                        c &= ~FIO_CLIENT_FLAG;
                }
 
@@ -1301,14 +1305,16 @@ int parse_cmd_line(int argc, char *argv[])
                        terse_output = 1;
                        break;
                case 'h':
-                       if (!cur_client)
+                       if (!cur_client) {
                                usage(argv[0]);
-                       do_exit++;
+                               do_exit++;
+                       }
                        break;
                case 'c':
-                       if (!cur_client)
+                       if (!cur_client) {
                                fio_show_option_help(optarg);
-                       do_exit++;
+                               do_exit++;
+                       }
                        break;
                case 's':
                        dump_cmdline = 1;
@@ -1317,13 +1323,14 @@ int parse_cmd_line(int argc, char *argv[])
                        read_only = 1;
                        break;
                case 'v':
-                       if (!cur_client)
-                               log_info("%s\n", fio_version_string);
-                       do_exit++;
+                       if (!cur_client) {
+                               log_info("fio %s\n", fio_version_string);
+                               do_exit++;
+                       }
                        break;
                case 'V':
                        terse_version = atoi(optarg);
-                       if (terse_version != 2) {
+                       if (!(terse_version == 2 || terse_version == 3)) {
                                log_err("fio: bad terse version format\n");
                                exit_val = 1;
                                do_exit++;
@@ -1404,14 +1411,13 @@ int parse_cmd_line(int argc, char *argv[])
                                exit_val = 1;
                                break;
                        }
+                       if (optarg)
+                               fio_server_set_arg(optarg);
                        is_backend = 1;
                        backend = 1;
                        break;
                case 'D':
-                       daemonize_server = 1;
-                       break;
-               case 'P':
-                       fio_net_port = atoi(optarg);
+                       pid_file = strdup(optarg);
                        break;
                case 'C':
                        if (is_backend) {
@@ -1420,8 +1426,12 @@ int parse_cmd_line(int argc, char *argv[])
                                exit_val = 1;
                                break;
                        }
-                       fio_client_add(optarg);
-                       cur_client = optarg;
+                       if (fio_client_add(optarg, &cur_client)) {
+                               log_err("fio: failed adding client %s\n", optarg);
+                               do_exit++;
+                               exit_val = 1;
+                               break;
+                       }
                        break;
                default:
                        do_exit++;
@@ -1444,14 +1454,14 @@ int parse_cmd_line(int argc, char *argv[])
        }
 
        if (is_backend && backend)
-               return fio_start_server(daemonize_server);
+               return fio_start_server(pid_file);
 
        if (td) {
                if (!ret)
                        ret = add_job(td, td->o.name ?: "fio", 0);
        }
 
-       while (optind < argc) {
+       while (!ret && optind < argc) {
                ini_idx++;
                ini_file = realloc(ini_file, ini_idx * sizeof(char *));
                ini_file[ini_idx - 1] = strdup(argv[optind]);
@@ -1495,7 +1505,7 @@ int parse_options(int argc, char *argv[])
        }
 
        free(ini_file);
-       options_mem_free(&def_thread);
+       fio_options_free(&def_thread);
 
        if (!thread_number) {
                if (dump_cmdline)
@@ -1504,10 +1514,17 @@ int parse_options(int argc, char *argv[])
                        return 0;
                if (is_backend || nr_clients)
                        return 0;
+               if (did_arg)
+                       return 0;
 
                log_err("No jobs(s) defined\n\n");
-               usage(argv[0]);
-               return 1;
+
+               if (!did_arg) {
+                       usage(argv[0]);
+                       return 1;
+               }
+
+               return 0;
        }
 
        if (def_thread.o.gtod_offload) {
@@ -1516,6 +1533,8 @@ int parse_options(int argc, char *argv[])
                fio_gtod_cpu = def_thread.o.gtod_cpu;
        }
 
-       log_info("%s\n", fio_version_string);
+       if (!terse_output)
+               log_info("fio %s\n", fio_version_string);
+
        return 0;
 }