client: ensure that cmd line arguments are always run
[fio.git] / init.c
diff --git a/init.c b/init.c
index 623d4a12c9c76efddfbe070a4a8ff3b64d3b4ad8..c4d6a1ee150860de95c322d945a9731a519d181c 100644 (file)
--- a/init.c
+++ b/init.c
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.58";
+#if FIO_PATCH > 0
+static 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) "."  \
+                                       __fio_stringify(FIO_MINOR);
+#endif
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
 static char **ini_file;
 static int max_jobs = FIO_MAX_JOBS;
 static int dump_cmdline;
+static int def_timeout;
 
 static struct thread_data def_thread;
 struct thread_data *threads = NULL;
@@ -47,6 +55,7 @@ int warnings_fatal = 0;
 int terse_version = 2;
 int is_backend = 0;
 int nr_clients = 0;
+int log_syslog = 0;
 
 int write_bw_log = 0;
 int read_only = 0;
@@ -61,6 +70,26 @@ unsigned int *fio_debug_jobp = NULL;
 
 static char cmd_optstr[256];
 
+const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = {
+       { .u.f  =  1.0 },
+       { .u.f  =  5.0 },
+       { .u.f  = 10.0 },
+       { .u.f  = 20.0 },
+       { .u.f  = 30.0 },
+       { .u.f  = 40.0 },
+       { .u.f  = 50.0 },
+       { .u.f  = 60.0 },
+       { .u.f  = 70.0 },
+       { .u.f  = 80.0 },
+       { .u.f  = 90.0 },
+       { .u.f  = 95.0 },
+       { .u.f  = 99.0 },
+       { .u.f  = 99.5 },
+       { .u.f  = 99.9 },
+};
+
+#define FIO_CLIENT_FLAG                (1 << 16)
+
 /*
  * Command line options. These will contain the above, plus a few
  * extra that only pertain to fio itself and not jobs.
@@ -69,98 +98,102 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
        {
                .name           = (char *) "output",
                .has_arg        = required_argument,
-               .val            = 'o',
+               .val            = 'o' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "timeout",
                .has_arg        = required_argument,
-               .val            = 't',
+               .val            = 't' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "latency-log",
                .has_arg        = required_argument,
-               .val            = 'l',
+               .val            = 'l' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "bandwidth-log",
                .has_arg        = required_argument,
-               .val            = 'b',
+               .val            = 'b' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "minimal",
                .has_arg        = optional_argument,
-               .val            = 'm',
+               .val            = 'm' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "version",
                .has_arg        = no_argument,
-               .val            = 'v',
+               .val            = 'v' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "help",
                .has_arg        = no_argument,
-               .val            = 'h',
+               .val            = 'h' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "cmdhelp",
                .has_arg        = optional_argument,
-               .val            = 'c',
+               .val            = 'c' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "showcmd",
                .has_arg        = no_argument,
-               .val            = 's',
+               .val            = 's' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "readonly",
                .has_arg        = no_argument,
-               .val            = 'r',
+               .val            = 'r' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "eta",
                .has_arg        = required_argument,
-               .val            = 'e',
+               .val            = 'e' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "debug",
                .has_arg        = required_argument,
-               .val            = 'd',
+               .val            = 'd' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "section",
                .has_arg        = required_argument,
-               .val            = 'x',
+               .val            = 'x' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "alloc-size",
                .has_arg        = required_argument,
-               .val            = 'a',
+               .val            = 'a' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "profile",
                .has_arg        = required_argument,
-               .val            = 'p',
+               .val            = 'p' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "warnings-fatal",
                .has_arg        = no_argument,
-               .val            = 'w',
+               .val            = 'w' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "max-jobs",
                .has_arg        = required_argument,
-               .val            = 'j',
+               .val            = 'j' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "terse-version",
                .has_arg        = required_argument,
-               .val            = 'V',
+               .val            = 'V' | FIO_CLIENT_FLAG,
        },
        {
                .name           = (char *) "server",
                .has_arg        = no_argument,
                .val            = 'S',
        },
+       {       .name           = (char *) "daemonize",
+               .has_arg        = no_argument,
+               .val            = 'D',
+       },
        {
                .name           = (char *) "net-port",
                .has_arg        = required_argument,
@@ -176,6 +209,74 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
        },
 };
 
+static void free_shm(void)
+{
+       struct shmid_ds sbuf;
+
+       if (threads) {
+               void *tp = threads;
+
+               threads = NULL;
+               file_hash_exit();
+               fio_debug_jobp = NULL;
+               shmdt(tp);
+               shmctl(shm_id, IPC_RMID, &sbuf);
+       }
+
+       scleanup();
+}
+
+/*
+ * The thread area is shared between the main process and the job
+ * threads/processes. So setup a shared memory segment that will hold
+ * all the job info. We use the end of the region for keeping track of
+ * open files across jobs, for file sharing.
+ */
+static int setup_thread_area(void)
+{
+       void *hash;
+
+       if (threads)
+               return 0;
+
+       /*
+        * 1024 is too much on some machines, scale max_jobs if
+        * we get a failure that looks like too large a shm segment
+        */
+       do {
+               size_t size = max_jobs * sizeof(struct thread_data);
+
+               size += file_hash_size;
+               size += sizeof(unsigned int);
+
+               shm_id = shmget(0, size, IPC_CREAT | 0600);
+               if (shm_id != -1)
+                       break;
+               if (errno != EINVAL) {
+                       perror("shmget");
+                       break;
+               }
+
+               max_jobs >>= 1;
+       } while (max_jobs);
+
+       if (shm_id == -1)
+               return 1;
+
+       threads = shmat(shm_id, NULL, 0);
+       if (threads == (void *) -1) {
+               perror("shmat");
+               return 1;
+       }
+
+       memset(threads, 0, max_jobs * sizeof(struct thread_data));
+       hash = (void *) threads + max_jobs * sizeof(struct thread_data);
+       fio_debug_jobp = (void *) hash + file_hash_size;
+       *fio_debug_jobp = -1;
+       file_hash_init(hash);
+       return 0;
+}
+
 /*
  * Return a free job structure.
  */
@@ -185,6 +286,10 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 
        if (global)
                return &def_thread;
+       if (setup_thread_area()) {
+               log_err("error: failed to setup shm segment\n");
+               return NULL;
+       }
        if (thread_number >= max_jobs) {
                log_err("error: maximum number of jobs (%d) reached.\n",
                                max_jobs);
@@ -634,9 +739,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
        td->ts.clat_percentiles = td->o.clat_percentiles;
        if (td->o.overwrite_plist)
-               td->ts.percentile_list = td->o.percentile_list;
+               memcpy(td->ts.percentile_list, td->o.percentile_list, sizeof(td->o.percentile_list));
        else
-               td->ts.percentile_list = NULL;
+               memcpy(td->ts.percentile_list, def_percentile_list, sizeof(def_percentile_list));
 
        td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
        td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
@@ -659,12 +764,14 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                goto err;
 
        if (td->o.write_lat_log) {
-               setup_log(&td->ts.lat_log);
-               setup_log(&td->ts.slat_log);
-               setup_log(&td->ts.clat_log);
+               setup_log(&td->lat_log);
+               setup_log(&td->slat_log);
+               setup_log(&td->clat_log);
        }
        if (td->o.write_bw_log)
-               setup_log(&td->ts.bw_log);
+               setup_log(&td->bw_log);
+       if (td->o.write_iops_log)
+               setup_log(&td->iops_log);
 
        if (!td->o.name)
                td->o.name = strdup(jobname);
@@ -981,6 +1088,7 @@ static int fill_def_thread(void)
        memset(&def_thread, 0, sizeof(def_thread));
 
        fio_getaffinity(getpid(), &def_thread.o.cpumask);
+       def_thread.o.timeout = def_timeout;
 
        /*
         * fill default options
@@ -989,72 +1097,6 @@ static int fill_def_thread(void)
        return 0;
 }
 
-static void free_shm(void)
-{
-       struct shmid_ds sbuf;
-
-       if (threads) {
-               void *tp = threads;
-
-               threads = NULL;
-               file_hash_exit();
-               fio_debug_jobp = NULL;
-               shmdt(tp);
-               shmctl(shm_id, IPC_RMID, &sbuf);
-       }
-
-       scleanup();
-}
-
-/*
- * The thread area is shared between the main process and the job
- * threads/processes. So setup a shared memory segment that will hold
- * all the job info. We use the end of the region for keeping track of
- * open files across jobs, for file sharing.
- */
-static int setup_thread_area(void)
-{
-       void *hash;
-
-       /*
-        * 1024 is too much on some machines, scale max_jobs if
-        * we get a failure that looks like too large a shm segment
-        */
-       do {
-               size_t size = max_jobs * sizeof(struct thread_data);
-
-               size += file_hash_size;
-               size += sizeof(unsigned int);
-
-               shm_id = shmget(0, size, IPC_CREAT | 0600);
-               if (shm_id != -1)
-                       break;
-               if (errno != EINVAL) {
-                       perror("shmget");
-                       break;
-               }
-
-               max_jobs >>= 1;
-       } while (max_jobs);
-
-       if (shm_id == -1)
-               return 1;
-
-       threads = shmat(shm_id, NULL, 0);
-       if (threads == (void *) -1) {
-               perror("shmat");
-               return 1;
-       }
-
-       memset(threads, 0, max_jobs * sizeof(struct thread_data));
-       hash = (void *) threads + max_jobs * sizeof(struct thread_data);
-       fio_debug_jobp = (void *) hash + file_hash_size;
-       *fio_debug_jobp = -1;
-       file_hash_init(hash);
-       atexit(free_shm);
-       return 0;
-}
-
 static void usage(const char *name)
 {
        printf("%s\n", fio_version_string);
@@ -1102,6 +1144,7 @@ struct debug_level debug_levels[] = {
        { .name = "mutex",      .shift = FD_MUTEX },
        { .name = "profile",    .shift = FD_PROFILE },
        { .name = "time",       .shift = FD_TIME },
+       { .name = "net",        .shift = FD_NET },
        { .name = NULL, },
 };
 
@@ -1186,19 +1229,59 @@ static void fio_options_fill_optstring(void)
        ostr[c] = '\0';
 }
 
-static int parse_cmd_line(int argc, char *argv[])
+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);
+}
+
+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;
+       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) {
+               if ((c & FIO_CLIENT_FLAG) || client_flag_set(c)) {
+                       if (parse_cmd_client(cur_client, argv[optind - 1])) {
+                               exit_val = 1;
+                               do_exit++;
+                               break;
+                       }
+                       c &= ~FIO_CLIENT_FLAG;
+               }
+
                switch (c) {
                case 'a':
                        smalloc_pool_size = atoi(optarg);
                        break;
                case 't':
-                       def_thread.o.timeout = atoi(optarg);
+                       def_timeout = atoi(optarg);
                        break;
                case 'l':
                        write_lat_log = 1;
@@ -1218,10 +1301,15 @@ static 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;
@@ -1229,8 +1317,10 @@ static 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("%s\n", fio_version_string);
+                       do_exit++;
+                       break;
                case 'V':
                        terse_version = atoi(optarg);
                        if (terse_version != 2) {
@@ -1315,6 +1405,10 @@ static int parse_cmd_line(int argc, char *argv[])
                                break;
                        }
                        is_backend = 1;
+                       backend = 1;
+                       break;
+               case 'D':
+                       daemonize_server = 1;
                        break;
                case 'P':
                        fio_net_port = atoi(optarg);
@@ -1327,25 +1421,30 @@ static int parse_cmd_line(int argc, char *argv[])
                                break;
                        }
                        fio_client_add(optarg);
+                       cur_client = optarg;
                        break;
                default:
                        do_exit++;
                        exit_val = 1;
                        break;
                }
+               if (do_exit)
+                       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++;
                exit_val = 1;
-               return 1;
+               return -1;
        }
 
-       if (is_backend)
-               return fio_server();
+       if (is_backend && backend)
+               return fio_start_server(daemonize_server);
 
        if (td) {
                if (!ret)
@@ -1372,24 +1471,26 @@ int parse_options(int argc, char *argv[])
        fio_options_fill_optstring();
        fio_options_dup_and_init(l_opts);
 
-       if (setup_thread_area())
-               return 1;
+       atexit(free_shm);
+
        if (fill_def_thread())
                return 1;
 
        job_files = parse_cmd_line(argc, argv);
 
-       for (i = 0; i < job_files; i++) {
-               if (fill_def_thread())
-                       return 1;
-               if (nr_clients) {
-                       if (fio_clients_send_ini(ini_file[i]))
-                               return 1;
-                       free(ini_file[i]);
-               } else if (!is_backend) {
-                       if (parse_jobs_ini(ini_file[i], 0, i))
+       if (job_files > 0) {
+               for (i = 0; i < job_files; i++) {
+                       if (fill_def_thread())
                                return 1;
-                       free(ini_file[i]);
+                       if (nr_clients) {
+                               if (fio_clients_send_ini(ini_file[i]))
+                                       return 1;
+                               free(ini_file[i]);
+                       } else if (!is_backend) {
+                               if (parse_jobs_ini(ini_file[i], 0, i))
+                                       return 1;
+                               free(ini_file[i]);
+                       }
                }
        }