Also cleanup up the handling of them, using a flag to know which
options to handle locally vs remotely.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-static void __fio_client_add_cmd_option(struct fio_client *client,
- const char *opt)
+static int __fio_client_add_cmd_option(struct fio_client *client,
+ const char *opt)
+ if (client->argc == FIO_NET_CMD_JOBLINE_ARGV) {
+ log_err("fio: max cmd line number reached.\n");
+ log_err("fio: cmd line <%s> has been ignored.\n", opt);
+ return 1;
+ }
+
index = client->argc++;
client->argv = realloc(client->argv, sizeof(char *) * client->argc);
client->argv[index] = strdup(opt);
dprint(FD_NET, "client: add cmd %d: %s\n", index, opt);
index = client->argc++;
client->argv = realloc(client->argv, sizeof(char *) * client->argc);
client->argv[index] = strdup(opt);
dprint(FD_NET, "client: add cmd %d: %s\n", index, opt);
-void fio_client_add_cmd_option(const char *hostname, const char *opt)
+int fio_client_add_cmd_option(const char *hostname, const char *opt)
{
struct fio_client *client;
if (!hostname || !opt)
{
struct fio_client *client;
if (!hostname || !opt)
client = find_client_by_name(hostname);
if (!client) {
log_err("fio: unknown client %s\n", hostname);
client = find_client_by_name(hostname);
if (!client) {
log_err("fio: unknown client %s\n", hostname);
- __fio_client_add_cmd_option(client, opt);
+ return __fio_client_add_cmd_option(client, opt);
}
void fio_client_add(const char *hostname)
}
void fio_client_add(const char *hostname)
+#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.
/*
* 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,
{
.name = (char *) "output",
.has_arg = required_argument,
+ .val = 'o' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "timeout",
.has_arg = required_argument,
},
{
.name = (char *) "timeout",
.has_arg = required_argument,
+ .val = 't' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "latency-log",
.has_arg = required_argument,
},
{
.name = (char *) "latency-log",
.has_arg = required_argument,
+ .val = 'l' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "bandwidth-log",
.has_arg = required_argument,
},
{
.name = (char *) "bandwidth-log",
.has_arg = required_argument,
+ .val = 'b' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "minimal",
.has_arg = optional_argument,
},
{
.name = (char *) "minimal",
.has_arg = optional_argument,
+ .val = 'm' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "version",
.has_arg = no_argument,
},
{
.name = (char *) "version",
.has_arg = no_argument,
+ .val = 'v' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "help",
.has_arg = no_argument,
},
{
.name = (char *) "help",
.has_arg = no_argument,
+ .val = 'h' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "cmdhelp",
.has_arg = optional_argument,
},
{
.name = (char *) "cmdhelp",
.has_arg = optional_argument,
+ .val = 'c' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "showcmd",
.has_arg = no_argument,
},
{
.name = (char *) "showcmd",
.has_arg = no_argument,
+ .val = 's' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "readonly",
.has_arg = no_argument,
},
{
.name = (char *) "readonly",
.has_arg = no_argument,
+ .val = 'r' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "eta",
.has_arg = required_argument,
},
{
.name = (char *) "eta",
.has_arg = required_argument,
+ .val = 'e' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "debug",
.has_arg = required_argument,
},
{
.name = (char *) "debug",
.has_arg = required_argument,
+ .val = 'd' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "section",
.has_arg = required_argument,
},
{
.name = (char *) "section",
.has_arg = required_argument,
+ .val = 'x' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "alloc-size",
.has_arg = required_argument,
},
{
.name = (char *) "alloc-size",
.has_arg = required_argument,
+ .val = 'a' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "profile",
.has_arg = required_argument,
},
{
.name = (char *) "profile",
.has_arg = required_argument,
+ .val = 'p' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "warnings-fatal",
.has_arg = no_argument,
},
{
.name = (char *) "warnings-fatal",
.has_arg = no_argument,
+ .val = 'w' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "max-jobs",
.has_arg = required_argument,
},
{
.name = (char *) "max-jobs",
.has_arg = required_argument,
+ .val = 'j' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "terse-version",
.has_arg = required_argument,
},
{
.name = (char *) "terse-version",
.has_arg = required_argument,
+ .val = 'V' | FIO_CLIENT_FLAG,
},
{
.name = (char *) "server",
},
{
.name = (char *) "server",
+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 parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
int backend = 0;
while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
int backend = 0;
while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
+
+ if (c & FIO_CLIENT_FLAG) {
+ if (parse_cmd_client(cur_client, argv[optind - 1])) {
+ exit_val = 1;
+ do_exit++;
+ break;
+ }
+ c &= ~FIO_CLIENT_FLAG;
+ }
+
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
smalloc_pool_size = atoi(optarg);
break;
case 't':
smalloc_pool_size = atoi(optarg);
break;
case 't':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
def_timeout = atoi(optarg);
break;
case 'l':
def_timeout = atoi(optarg);
break;
case 'l':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
write_lat_log = 1;
break;
case 'b':
write_lat_log = 1;
break;
case 'b':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
write_bw_log = 1;
break;
case 'o':
write_bw_log = 1;
break;
case 'o':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
f_out = fopen(optarg, "w+");
if (!f_out) {
perror("fopen output");
f_out = fopen(optarg, "w+");
if (!f_out) {
perror("fopen output");
f_err = f_out;
break;
case 'm':
f_err = f_out;
break;
case 'm':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
terse_output = 1;
break;
case 'h':
terse_output = 1;
break;
case 'h':
case 'c':
exit(fio_show_option_help(optarg));
case 's':
case 'c':
exit(fio_show_option_help(optarg));
case 's':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
dump_cmdline = 1;
break;
case 'r':
dump_cmdline = 1;
break;
case 'r':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
read_only = 1;
break;
case 'v':
log_info("%s\n", fio_version_string);
exit(0);
case 'V':
read_only = 1;
break;
case 'v':
log_info("%s\n", fio_version_string);
exit(0);
case 'V':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
terse_version = atoi(optarg);
if (terse_version != 2) {
log_err("fio: bad terse version format\n");
terse_version = atoi(optarg);
if (terse_version != 2) {
log_err("fio: bad terse version format\n");
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
if (!strcmp("always", optarg))
eta_print = FIO_ETA_ALWAYS;
else if (!strcmp("never", optarg))
eta_print = FIO_ETA_NEVER;
break;
case 'd':
if (!strcmp("always", optarg))
eta_print = FIO_ETA_ALWAYS;
else if (!strcmp("never", optarg))
eta_print = FIO_ETA_NEVER;
break;
case 'd':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
if (set_debug(optarg))
do_exit++;
break;
case 'x': {
size_t new_size;
if (set_debug(optarg))
do_exit++;
break;
case 'x': {
size_t new_size;
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
-
if (!strcmp(optarg, "global")) {
log_err("fio: can't use global as only "
"section\n");
if (!strcmp(optarg, "global")) {
log_err("fio: can't use global as only "
"section\n");
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
exec_profile = strdup(optarg);
break;
case FIO_GETOPT_JOB: {
const char *opt = l_opts[lidx].name;
char *val = optarg;
exec_profile = strdup(optarg);
break;
case FIO_GETOPT_JOB: {
const char *opt = l_opts[lidx].name;
char *val = optarg;
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
-
if (!strncmp(opt, "name", 4) && td) {
ret = add_job(td, td->o.name ?: "fio", 0);
if (ret)
if (!strncmp(opt, "name", 4) && td) {
ret = add_job(td, td->o.name ?: "fio", 0);
if (ret)
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
warnings_fatal = 1;
break;
case 'j':
warnings_fatal = 1;
break;
case 'j':
- fio_client_add_cmd_option(cur_client, argv[optind-1]);
max_jobs = atoi(optarg);
if (!max_jobs || max_jobs > REAL_MAX_JOBS) {
log_err("fio: invalid max jobs: %d\n", max_jobs);
max_jobs = atoi(optarg);
if (!max_jobs || max_jobs > REAL_MAX_JOBS) {
log_err("fio: invalid max jobs: %d\n", max_jobs);
extern int fio_clients_send_ini(const char *);
extern int fio_handle_clients(void);
extern void fio_client_add(const char *);
extern int fio_clients_send_ini(const char *);
extern int fio_handle_clients(void);
extern void fio_client_add(const char *);
-extern void fio_client_add_cmd_option(const char *, const char *);
+extern int fio_client_add_cmd_option(const char *, const char *);
extern int fio_recv_data(int sk, void *p, unsigned int len);
extern int fio_send_data(int sk, const void *p, unsigned int len);
extern int fio_recv_data(int sk, void *p, unsigned int len);
extern int fio_send_data(int sk, const void *p, unsigned int len);