Add support for client/server connection over unix domain sockets

[fio.git] / init.c

diff --git a/init.c b/init.c
index eba6dc2cef8e853c015bf3c4b22d09a94897179e..486b743578873e945b982538e37588ed479c40ca 100644 (file)
--- a/init.c
+++ b/init.c
@@ -69,6 +69,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,7 +188,7 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
        },
        {
                .name           = (char *) "server",
-               .has_arg        = no_argument,
+               .has_arg        = optional_argument,
                .val            = 'S',
        },
        {       .name           = (char *) "daemonize",
@@ -1099,7 +1100,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");
@@ -1229,6 +1230,23 @@ static void fio_options_fill_optstring(void)
        ostr[c] = '\0';
 }
 
+static int client_flag_set(char c)
+{
+       int i;
+
+       i = 0;
+       while (l_opts[i].name) {
+               int val = l_opts[i].val;
+
+               if (c == (val & 0xff))
+                       return (val & FIO_CLIENT_FLAG);
+
+               i++;
+       }
+
+       return 0;
+}
+
 int parse_cmd_client(char *client, char *opt)
 {
        return fio_client_add_cmd_option(client, opt);
@@ -1243,9 +1261,16 @@ int parse_cmd_line(int argc, char *argv[])
        char *cur_client = NULL;
        int backend = 0;
 
+       /*
+        * Reset optind handling, since we may call this multiple times
+        * for the backend.
+        */
+       optind = 1;
+
        while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
+               did_arg = 1;
 
-               if (c & FIO_CLIENT_FLAG) {
+               if ((c & FIO_CLIENT_FLAG) || client_flag_set(c)) {
                        if (parse_cmd_client(cur_client, argv[optind - 1])) {
                                exit_val = 1;
                                do_exit++;
@@ -1279,10 +1304,17 @@ int parse_cmd_line(int argc, char *argv[])
                        terse_output = 1;
                        break;
                case 'h':
-                       usage(argv[0]);
-                       exit(0);
+                       if (!cur_client) {
+                               usage(argv[0]);
+                               do_exit++;
+                       }
+                       break;
                case 'c':
-                       exit(fio_show_option_help(optarg));
+                       if (!cur_client) {
+                               fio_show_option_help(optarg);
+                               do_exit++;
+                       }
+                       break;
                case 's':
                        dump_cmdline = 1;
                        break;
@@ -1290,8 +1322,11 @@ int parse_cmd_line(int argc, char *argv[])
                        read_only = 1;
                        break;
                case 'v':
-                       log_info("%s\n", fio_version_string);
-                       exit(0);
+                       if (!cur_client) {
+                               log_info("fio %s\n", fio_version_string);
+                               do_exit++;
+                       }
+                       break;
                case 'V':
                        terse_version = atoi(optarg);
                        if (terse_version != 2) {
@@ -1375,6 +1410,8 @@ int parse_cmd_line(int argc, char *argv[])
                                exit_val = 1;
                                break;
                        }
+                       if (optarg)
+                               fio_server_add_arg(optarg);
                        is_backend = 1;
                        backend = 1;
                        break;
@@ -1403,8 +1440,10 @@ int parse_cmd_line(int argc, char *argv[])
                        break;
        }
 
-       if (do_exit)
-               exit(exit_val);
+       if (do_exit) {
+               if (exit_val && !(is_backend || nr_clients))
+                       exit(exit_val);
+       }
 
        if (nr_clients && fio_clients_connect()) {
                do_exit++;
@@ -1420,7 +1459,7 @@ int parse_cmd_line(int argc, char *argv[])
                        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]);
@@ -1473,10 +1512,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) {
@@ -1485,6 +1531,6 @@ int parse_options(int argc, char *argv[])
                fio_gtod_cpu = def_thread.o.gtod_cpu;
        }
 
-       log_info("%s\n", fio_version_string);
+       log_info("fio %s\n", fio_version_string);
        return 0;
 }