X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=2341915831d22eff07b88a468283aa24fe029cc2;hp=2ae93a026f2aad21025ea3eae8bfc1491646062b;hb=9ef56d461ae5c4e9a77dd8ea3025658271c79387;hpb=2615cc4b28e7d0e436a625dff92e6a71ccc6c49b diff --git a/init.c b/init.c index 2ae93a02..23419158 100644 --- a/init.c +++ b/init.c @@ -19,15 +19,23 @@ #include "filehash.h" #include "verify.h" #include "profile.h" +#include "server.h" #include "lib/getopt.h" -static char fio_version_string[] = "fio 1.51"; +#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 = MAX_JOBS; +static int max_jobs = FIO_MAX_JOBS; static int dump_cmdline; static struct thread_data def_thread; @@ -43,11 +51,14 @@ char **job_sections = NULL; int nr_job_sections = 0; char *exec_profile = NULL; 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; -static int def_timeout; static int write_lat_log; static int prev_group_jobs; @@ -64,98 +75,185 @@ static char cmd_optstr[256]; */ static struct option l_opts[FIO_NR_OPTIONS] = { { - .name = "output", + .name = (char *) "output", .has_arg = required_argument, .val = 'o', }, { - .name = "timeout", + .name = (char *) "timeout", .has_arg = required_argument, .val = 't', }, { - .name = "latency-log", + .name = (char *) "latency-log", .has_arg = required_argument, .val = 'l', }, { - .name = "bandwidth-log", + .name = (char *) "bandwidth-log", .has_arg = required_argument, .val = 'b', }, { - .name = "minimal", + .name = (char *) "minimal", .has_arg = optional_argument, .val = 'm', }, { - .name = "version", + .name = (char *) "version", .has_arg = no_argument, .val = 'v', }, { - .name = "help", + .name = (char *) "help", .has_arg = no_argument, .val = 'h', }, { - .name = "cmdhelp", + .name = (char *) "cmdhelp", .has_arg = optional_argument, .val = 'c', }, { - .name = "showcmd", + .name = (char *) "showcmd", .has_arg = no_argument, .val = 's', }, { - .name = "readonly", + .name = (char *) "readonly", .has_arg = no_argument, .val = 'r', }, { - .name = "eta", + .name = (char *) "eta", .has_arg = required_argument, .val = 'e', }, { - .name = "debug", + .name = (char *) "debug", .has_arg = required_argument, .val = 'd', }, { - .name = "section", + .name = (char *) "section", .has_arg = required_argument, .val = 'x', }, { - .name = "alloc-size", + .name = (char *) "alloc-size", .has_arg = required_argument, .val = 'a', }, { - .name = "profile", + .name = (char *) "profile", .has_arg = required_argument, .val = 'p', }, { - .name = "warnings-fatal", + .name = (char *) "warnings-fatal", .has_arg = no_argument, .val = 'w', }, + { + .name = (char *) "max-jobs", + .has_arg = required_argument, + .val = 'j', + }, + { + .name = (char *) "terse-version", + .has_arg = required_argument, + .val = 'V', + }, + { + .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, + .val = 'P', + }, + { + .name = (char *) "client", + .has_arg = required_argument, + .val = 'C', + }, { .name = NULL, }, }; -FILE *get_f_out() +static void free_shm(void) { - return f_out; + 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(); } -FILE *get_f_err() +/* + * 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) { - return f_err; + 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; } /* @@ -167,6 +265,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); @@ -191,7 +293,7 @@ static void put_job(struct thread_data *td) { if (td == &def_thread) return; - + profile_td_exit(td); if (td->error) @@ -463,7 +565,7 @@ static int exists_and_not_file(const char *filename) return 1; } -void td_fill_rand_seeds(struct thread_data *td) +static void td_fill_rand_seeds_os(struct thread_data *td) { os_random_seed(td->rand_seeds[0], &td->bsrange_state); os_random_seed(td->rand_seeds[1], &td->verify_state); @@ -482,9 +584,39 @@ void td_fill_rand_seeds(struct thread_data *td) td->rand_seeds[4] = FIO_RANDSEED * td->thread_number; os_random_seed(td->rand_seeds[4], &td->random_state); +} + +static void td_fill_rand_seeds_internal(struct thread_data *td) +{ + init_rand_seed(&td->__bsrange_state, td->rand_seeds[0]); + init_rand_seed(&td->__verify_state, td->rand_seeds[1]); + init_rand_seed(&td->__rwmix_state, td->rand_seeds[2]); + + if (td->o.file_service_type == FIO_FSERVICE_RANDOM) + init_rand_seed(&td->__next_file_state, td->rand_seeds[3]); + + init_rand_seed(&td->__file_size_state, td->rand_seeds[5]); + init_rand_seed(&td->__trim_state, td->rand_seeds[6]); + + if (!td_random(td)) + return; + + if (td->o.rand_repeatable) + td->rand_seeds[4] = FIO_RANDSEED * td->thread_number; + init_rand_seed(&td->__random_state, td->rand_seeds[4]); } +void td_fill_rand_seeds(struct thread_data *td) +{ + if (td->o.use_os_rand) + td_fill_rand_seeds_os(td); + else + td_fill_rand_seeds_internal(td); + + init_rand_seed(&td->buf_state, td->rand_seeds[7]); +} + /* * Initialize the various random states we need (random io, block size ranges, * read/write mix, etc). @@ -540,7 +672,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) } if (profile_td_init(td)) - return 1; + goto err; engine = get_engine_name(td->o.ioengine); td->io_ops = load_ioengine(td, engine); @@ -584,6 +716,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->mutex = fio_mutex_init(0); + td->ts.clat_percentiles = td->o.clat_percentiles; + if (td->o.overwrite_plist) + td->ts.percentile_list = td->o.percentile_list; + else + td->ts.percentile_list = NULL; + 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; td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX; @@ -605,12 +743,12 @@ 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.name) td->o.name = strdup(jobname); @@ -743,7 +881,7 @@ static int is_empty_or_comment(char *line) return 1; if (line[i] == '#') return 1; - if (!isspace(line[i]) && !iscntrl(line[i])) + if (!isspace((int) line[i]) && !iscntrl((int) line[i])) return 0; } @@ -753,7 +891,7 @@ static int is_empty_or_comment(char *line) /* * This is our [ini] type file parser. */ -static int parse_jobs_ini(char *file, int stonewall_flag) +int parse_jobs_ini(char *file, int is_buf, int stonewall_flag) { unsigned int global; struct thread_data *td; @@ -767,14 +905,18 @@ static int parse_jobs_ini(char *file, int stonewall_flag) char **opts; int i, alloc_opts, num_opts; - if (!strcmp(file, "-")) - f = stdin; - else - f = fopen(file, "r"); + if (is_buf) + f = NULL; + else { + if (!strcmp(file, "-")) + f = stdin; + else + f = fopen(file, "r"); - if (!f) { - perror("fopen job file"); - return 1; + if (!f) { + perror("fopen job file"); + return 1; + } } string = malloc(4096); @@ -796,7 +938,10 @@ static int parse_jobs_ini(char *file, int stonewall_flag) * haven't handled. */ if (!skip_fgets) { - p = fgets(string, 4095, f); + if (is_buf) + p = strsep(&file, "\n"); + else + p = fgets(string, 4095, f); if (!p) break; } @@ -807,7 +952,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag) if (is_empty_or_comment(p)) continue; - if (sscanf(p, "[%255s]", name) != 1) { + if (sscanf(p, "[%255[^\n]]", name) != 1) { if (inside_skip) continue; log_err("fio: option <%s> outside of [] job section\n", @@ -850,7 +995,14 @@ static int parse_jobs_ini(char *file, int stonewall_flag) num_opts = 0; memset(opts, 0, alloc_opts * sizeof(char *)); - while ((p = fgets(string, 4096, f)) != NULL) { + while (1) { + if (is_buf) + p = strsep(&file, "\n"); + else + p = fgets(string, 4096, f); + if (!p) + break; + if (is_empty_or_comment(p)) continue; @@ -903,7 +1055,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag) free(string); free(name); free(opts); - if (f != stdin) + if (!is_buf && f != stdin) fclose(f); return ret; } @@ -918,79 +1070,12 @@ static int fill_def_thread(void) * fill default options */ fio_fill_default_options(&def_thread); - - def_thread.o.timeout = def_timeout; - 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); printf("%s [options] [job options] \n", name); printf("\t--debug=options\tEnable debug logging\n"); printf("\t--output\tWrite output to file\n"); @@ -999,6 +1084,7 @@ static void usage(const char *name) printf("\t--bandwidth-log\tGenerate per-job bandwidth logs\n"); printf("\t--minimal\tMinimal (terse) output\n"); printf("\t--version\tPrint version info and exit\n"); + printf("\t--terse-version=x Terse version output format\n"); printf("\t--help\t\tPrint this page\n"); printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of" " them\n"); @@ -1011,6 +1097,10 @@ static void usage(const char *name) printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb" " (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("\nFio was written by Jens Axboe "); printf("\n Jens Axboe \n"); } @@ -1030,6 +1120,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, }, }; @@ -1114,27 +1205,35 @@ static void fio_options_fill_optstring(void) ostr[c] = '\0'; } -static int parse_cmd_line(int argc, char *argv[]) +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; while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) { switch (c) { case 'a': + fio_client_add_cmd_option(cur_client, argv[optind-1]); smalloc_pool_size = atoi(optarg); break; case 't': - def_timeout = atoi(optarg); + fio_client_add_cmd_option(cur_client, argv[optind-1]); + def_thread.o.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"); @@ -1143,6 +1242,7 @@ static 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': @@ -1151,27 +1251,42 @@ static int parse_cmd_line(int argc, char *argv[]) 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': + 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': + 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"); + exit_val = 1; + do_exit++; + } + 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"); @@ -1186,18 +1301,19 @@ static 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) { - put_job(td); + if (ret) return 0; - } td = NULL; } if (!td) { @@ -1219,23 +1335,68 @@ static 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); + do_exit++; + exit_val = 1; + } + break; + case 'S': + if (nr_clients) { + log_err("fio: can't be both client and server\n"); + do_exit++; + exit_val = 1; + break; + } + 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"); + do_exit++; + exit_val = 1; + 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 (nr_clients && fio_clients_connect()) { + do_exit++; + exit_val = 1; + return -1; + } + + if (is_backend && backend) + return fio_start_server(daemonize_server); + if (td) { if (!ret) ret = add_job(td, td->o.name ?: "fio", 0); - if (ret) - put_job(td); } while (optind < argc) { @@ -1258,19 +1419,27 @@ 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 (parse_jobs_ini(ini_file[i], i)) - return 1; - free(ini_file[i]); + if (job_files > 0) { + 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)) + return 1; + free(ini_file[i]); + } + } } free(ini_file); @@ -1281,9 +1450,13 @@ int parse_options(int argc, char *argv[]) return 0; if (exec_profile) return 0; + if (is_backend || nr_clients) + return 0; - log_err("No jobs(s) defined\n\n"); - usage(argv[0]); + if (job_files > 0) { + log_err("No jobs(s) defined\n\n"); + usage(argv[0]); + } return 1; }