X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=e8fef21edf567e645fef1d95a5cc83c532ba9d7b;hb=07511a632ef219eb578d8c7f12825a275c640bcf;hp=eba6dc2cef8e853c015bf3c4b22d09a94897179e;hpb=7a4b824059d9ce4b5151e904219c9b5e757ffd3b;p=fio.git diff --git a/init.c b/init.c index eba6dc2c..e8fef21e 100644 --- a/init.c +++ b/init.c @@ -23,6 +23,8 @@ #include "lib/getopt.h" +#include "fio_version.h" + #if FIO_PATCH > 0 static char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \ __fio_stringify(FIO_MINOR) "." \ @@ -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", @@ -1099,7 +1097,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] \n", name); printf("\t--debug=options\tEnable debug logging\n"); printf("\t--output\tWrite output to file\n"); @@ -1122,9 +1120,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 "); printf("\n Jens Axboe \n"); } @@ -1229,9 +1227,26 @@ static void fio_options_fill_optstring(void) ostr[c] = '\0'; } -int parse_cmd_client(char *client, char *opt) +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; +} + +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[]) @@ -1239,18 +1254,21 @@ 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; + /* + * 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 (parse_cmd_client(cur_client, argv[optind - 1])) { - exit_val = 1; - do_exit++; - break; - } + if ((c & FIO_CLIENT_FLAG) || client_flag_set(c)) { + parse_cmd_client(cur_client, argv[optind - 1]); c &= ~FIO_CLIENT_FLAG; } @@ -1279,10 +1297,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 +1315,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,14 +1403,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) { @@ -1391,8 +1418,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++; @@ -1403,8 +1434,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++; @@ -1413,14 +1446,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]); @@ -1473,10 +1506,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 +1525,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; }