X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=baf3130b34f171fd73605794ba7dd0d5f70cb4dd;hp=15adf38509cac27ba495e3cba58635db24dead53;hb=fca7035863bd570270376a0c06776e5549ff813e;hpb=996936f995c47f4744a49e05419e7d4c0364c64e diff --git a/init.c b/init.c index 15adf385..baf3130b 100644 --- a/init.c +++ b/init.c @@ -22,12 +22,12 @@ #include "lib/getopt.h" -static char fio_version_string[] = "fio 1.50-rc3"; +static char fio_version_string[] = "fio 1.55"; #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; @@ -39,7 +39,8 @@ int eta_print; unsigned long long mlock_size = 0; FILE *f_out = NULL; FILE *f_err = NULL; -char *job_section = NULL; +char **job_sections = NULL; +int nr_job_sections = 0; char *exec_profile = NULL; int warnings_fatal = 0; @@ -63,85 +64,90 @@ 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 = NULL, }, @@ -190,7 +196,7 @@ static void put_job(struct thread_data *td) { if (td == &def_thread) return; - + profile_td_exit(td); if (td->error) @@ -248,7 +254,7 @@ static int fixed_block_size(struct thread_options *o) static int fixup_options(struct thread_data *td) { struct thread_options *o = &td->o; - int ret; + int ret = 0; #ifndef FIO_HAVE_PSHARED_MUTEX if (!o->use_thread) { @@ -375,12 +381,6 @@ static int fixup_options(struct thread_data *td) o->size = -1ULL; if (o->verify != VERIFY_NONE) { - if (td_rw(td)) { - log_info("fio: mixed read/write workload with verify. " - "May not work as expected, unless you " - "pre-populated the file\n"); - ret = warnings_fatal; - } if (td_write(td) && o->do_verify && o->numjobs > 1) { log_info("Multiple writers may overwrite blocks that " "belong to other jobs. This can cause " @@ -468,7 +468,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); @@ -489,6 +489,35 @@ void td_fill_rand_seeds(struct thread_data *td) 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); +} + /* * Initialize the various random states we need (random io, block size ranges, * read/write mix, etc). @@ -544,7 +573,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); @@ -724,12 +753,18 @@ void add_job_opts(const char **o) static int skip_this_section(const char *name) { - if (!job_section) + int i; + + if (!nr_job_sections) return 0; if (!strncmp(name, "global", 6)) return 0; - return strcmp(job_section, name); + for (i = 0; i < nr_job_sections; i++) + if (!strcmp(job_sections[i], name)) + return 0; + + return 1; } static int is_empty_or_comment(char *line) @@ -805,7 +840,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", @@ -1009,6 +1044,7 @@ 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("\nFio was written by Jens Axboe "); printf("\n Jens Axboe \n"); } @@ -1039,8 +1075,6 @@ static int set_debug(const char *string) int i; if (!strcmp(string, "?") || !strcmp(string, "help")) { - int i; - log_info("fio: dumping debug options:"); for (i = 0; debug_levels[i].name; i++) { dl = &debug_levels[i]; @@ -1157,7 +1191,7 @@ static int parse_cmd_line(int argc, char *argv[]) read_only = 1; break; case 'v': - /* already being printed, just quit */ + log_info("%s\n", fio_version_string); exit(0); case 'e': if (!strcmp("always", optarg)) @@ -1169,7 +1203,9 @@ static int parse_cmd_line(int argc, char *argv[]) if (set_debug(optarg)) do_exit++; break; - case 'x': + case 'x': { + size_t new_size; + if (!strcmp(optarg, "global")) { log_err("fio: can't use global as only " "section\n"); @@ -1177,10 +1213,12 @@ static int parse_cmd_line(int argc, char *argv[]) exit_val = 1; break; } - if (job_section) - free(job_section); - job_section = strdup(optarg); + new_size = (nr_job_sections + 1) * sizeof(char *); + job_sections = realloc(job_sections, new_size); + job_sections[nr_job_sections] = strdup(optarg); + nr_job_sections++; break; + } case 'p': exec_profile = strdup(optarg); break; @@ -1190,10 +1228,8 @@ static int parse_cmd_line(int argc, char *argv[]) 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) { @@ -1217,6 +1253,14 @@ static int parse_cmd_line(int argc, char *argv[]) case 'w': warnings_fatal = 1; break; + case 'j': + 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; default: do_exit++; exit_val = 1; @@ -1230,8 +1274,6 @@ static int parse_cmd_line(int argc, char *argv[]) if (td) { if (!ret) ret = add_job(td, td->o.name ?: "fio", 0); - if (ret) - put_job(td); } while (optind < argc) { @@ -1251,8 +1293,6 @@ int parse_options(int argc, char *argv[]) f_out = stdout; f_err = stderr; - log_info("%s\n", fio_version_string); - fio_options_fill_optstring(); fio_options_dup_and_init(l_opts); @@ -1291,5 +1331,6 @@ int parse_options(int argc, char *argv[]) fio_gtod_cpu = def_thread.o.gtod_cpu; } + log_info("%s\n", fio_version_string); return 0; }