X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=849bcf9fd5e28d4ffab1979059d373ad153ae495;hp=fcee02bb918d649eb751aa1ad1fadd993cb4d263;hb=bebe639808147d587bbe776566d390b9ff98773f;hpb=d65e11c6483f6664ac93da58dd8d46508f651e53 diff --git a/init.c b/init.c index fcee02bb..849bcf9f 100644 --- 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 }, @@ -88,6 +89,8 @@ const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = { { .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. @@ -96,107 +99,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, + .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', - }, { .name = (char *) "client", .has_arg = required_argument, @@ -768,6 +766,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) } 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); @@ -1095,7 +1095,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"); @@ -1118,9 +1118,8 @@ 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--server=args\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("\nFio was written by Jens Axboe "); printf("\n Jens Axboe \n"); } @@ -1225,35 +1224,69 @@ 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(void *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; + void *cur_client; 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) || 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': - fio_client_add_cmd_option(cur_client, argv[optind-1]); 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': - fio_client_add_cmd_option(cur_client, argv[optind-1]); write_lat_log = 1; break; case 'b': - fio_client_add_cmd_option(cur_client, argv[optind-1]); 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"); @@ -1262,27 +1295,33 @@ int parse_cmd_line(int argc, char *argv[]) f_err = f_out; break; case 'm': - fio_client_add_cmd_option(cur_client, argv[optind-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': - fio_client_add_cmd_option(cur_client, argv[optind-1]); 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); + if (!cur_client) { + log_info("fio %s\n", fio_version_string); + do_exit++; + } + break; 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"); @@ -1291,22 +1330,18 @@ int parse_cmd_line(int argc, char *argv[]) } break; case 'e': - 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': - fio_client_add_cmd_option(cur_client, argv[optind-1]); 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"); @@ -1321,15 +1356,12 @@ int parse_cmd_line(int argc, char *argv[]) break; } case 'p': - 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; - 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) @@ -1355,11 +1387,9 @@ int parse_cmd_line(int argc, char *argv[]) break; } case 'w': - fio_client_add_cmd_option(cur_client, argv[optind-1]); 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); @@ -1374,15 +1404,14 @@ 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); - break; case 'C': if (is_backend) { log_err("fio: can't be both client and server\n"); @@ -1390,8 +1419,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++; @@ -1402,8 +1435,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++; @@ -1419,7 +1454,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]); @@ -1472,10 +1507,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) { @@ -1484,6 +1526,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; }