#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;
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.
{
.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",
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;
}
if (td->o.write_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);
memset(&def_thread, 0, sizeof(def_thread));
fio_getaffinity(getpid(), &def_thread.o.cpumask);
+ def_thread.o.timeout = def_timeout;
/*
* fill default options
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;
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;
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) {
break;
}
is_backend = 1;
+ backend = 1;
break;
case 'D':
daemonize_server = 1;
break;
}
fio_client_add(optarg);
+ cur_client = optarg;
break;
default:
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++;
return -1;
}
- if (is_backend)
+ if (is_backend && backend)
return fio_start_server(daemonize_server);
if (td) {
if (is_backend || nr_clients)
return 0;
- if (job_files > 0) {
- log_err("No jobs(s) defined\n\n");
- usage(argv[0]);
- }
+ log_err("No jobs(s) defined\n\n");
+ usage(argv[0]);
return 1;
}
projects / fio.git / blobdiff