X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=95c282acaae8bff48b30eedbd9ef2ffde5427ead;hp=7711189ccd4d2f86a2ddd49db271cfef200b97c9;hb=112b52d9033015ce46506fd05c67c6a537024c59;hpb=4aae5155980cd5e1cfc8303cd30653e1238f4856 diff --git a/init.c b/init.c index 7711189c..95c282ac 100644 --- a/init.c +++ b/init.c @@ -19,7 +19,7 @@ #include "smalloc.h" #include "filehash.h" -static char fio_version_string[] = "fio 1.20-rc2"; +static char fio_version_string[] = "fio 1.24"; #define FIO_RANDSEED (0xb1899bedUL) @@ -27,7 +27,7 @@ static char **ini_file; static int max_jobs = MAX_JOBS; static int dump_cmdline; -struct thread_data def_thread; +static struct thread_data def_thread; struct thread_data *threads = NULL; int exitall_on_terminate = 0; @@ -47,6 +47,8 @@ static int write_lat_log; static int prev_group_jobs; unsigned long fio_debug = 0; +unsigned int fio_debug_jobno = -1; +unsigned int *fio_debug_jobp = NULL; /* * Command line options. These will contain the above, plus a few @@ -118,6 +120,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'x', }, + { + .name = "alloc-size", + .has_arg = required_argument, + .val = 'a', + }, { .name = NULL, }, @@ -207,15 +214,29 @@ static int fixup_options(struct thread_data *td) { struct thread_options *o = &td->o; +#ifndef FIO_HAVE_PSHARED_MUTEX + if (!td->o.use_thread) { + log_info("fio: this platform does not support process shared" + " mutexes, forcing use of threads. Use the 'thread'" + " option to get rid of this warning.\n"); + td->o.use_thread = 1; + } +#endif + +#ifndef FIO_HAVE_CPU_AFFINITY + if (td->o.gtod_cpu) { + log_err("fio: platform must support CPU affinity for" + "gettimeofday() offloading\n"); + return 1; + } +#endif + if (read_only && td_write(td)) { log_err("fio: job <%s> has write bit set, but fio is in" " read-only mode\n", td->o.name); return 1; } - if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100) - o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ]; - if (o->write_iolog_file && o->read_iolog_file) { log_err("fio: read iolog overrides write_iolog\n"); free(o->write_iolog_file); @@ -303,12 +324,15 @@ static int fixup_options(struct thread_data *td) } if (o->fill_device && !o->size) - o->size = ULONG_LONG_MAX; + o->size = -1ULL; if (td_rw(td) && td->o.verify != VERIFY_NONE) log_info("fio: mixed read/write workload with verify. May not " "work as expected, unless you pre-populated the file\n"); + if (td->o.verify != VERIFY_NONE) + td->o.refill_buffers = 1; + return 0; } @@ -446,7 +470,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->io_ops->flags |= FIO_RAWIO; file_alloced = 0; - if (!td->o.filename && !td->files_index) { + if (!td->o.filename && !td->files_index && !td->o.read_iolog_file) { file_alloced = 1; if (td->o.nr_files == 1 && exists_and_not_file(jobname)) @@ -607,6 +631,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag) int first_sect = 1; int skip_fgets = 0; int inside_skip = 0; + char **opts; + int i, alloc_opts, num_opts; if (!strcmp(file, "-")) f = stdin; @@ -626,6 +652,10 @@ static int parse_jobs_ini(char *file, int stonewall_flag) name = malloc(280); memset(name, 0, 280); + alloc_opts = 8; + opts = malloc(sizeof(char *) * alloc_opts); + num_opts = 0; + stonewall = stonewall_flag; do { /* @@ -684,6 +714,9 @@ static int parse_jobs_ini(char *file, int stonewall_flag) stonewall = 0; } + num_opts = 0; + memset(opts, 0, alloc_opts * sizeof(char *)); + while ((p = fgets(string, 4096, f)) != NULL) { if (is_empty_or_comment(p)) continue; @@ -701,29 +734,42 @@ static int parse_jobs_ini(char *file, int stonewall_flag) strip_blank_end(p); - /* - * Don't break here, continue parsing options so we - * dump all the bad ones. Makes trial/error fixups - * easier on the user. - */ - ret |= fio_option_parse(td, p); - if (!ret && dump_cmdline) - log_info("--%s ", p); + if (num_opts == alloc_opts) { + alloc_opts <<= 1; + opts = realloc(opts, + alloc_opts * sizeof(char *)); + } + + opts[num_opts] = strdup(p); + num_opts++; } - if (!ret) + ret = fio_options_parse(td, opts, num_opts); + if (!ret) { + if (dump_cmdline) + for (i = 0; i < num_opts; i++) + log_info("--%s ", opts[i]); + ret = add_job(td, name, 0); - else { + } else { log_err("fio: job %s dropped\n", name); put_job(td); } + + for (i = 0; i < num_opts; i++) + free(opts[i]); + num_opts = 0; } while (!ret); if (dump_cmdline) log_info("\n"); + for (i = 0; i < num_opts; i++) + free(opts[i]); + free(string); free(name); + free(opts); if (f != stdin) fclose(f); return ret; @@ -752,8 +798,12 @@ static void free_shm(void) struct shmid_ds sbuf; if (threads) { - shmdt((void *) threads); + void *tp = threads; + threads = NULL; + file_hash_exit(); + fio_debug_jobp = NULL; + shmdt(tp); shmctl(shm_id, IPC_RMID, &sbuf); } @@ -778,6 +828,7 @@ static int setup_thread_area(void) 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) @@ -801,6 +852,8 @@ static int setup_thread_area(void) 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; @@ -826,6 +879,8 @@ static void usage(const char *name) printf("\t--readonly\tTurn on safety read-only checks, preventing" " writes\n"); printf("\t--section=name\tOnly run specified section in job file\n"); + printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb" + " (def 1024)\n"); } #ifdef FIO_INC_DEBUG @@ -838,7 +893,10 @@ struct debug_level debug_levels[] = { { .name = "verify", .shift = FD_VERIFY }, { .name = "random", .shift = FD_RANDOM }, { .name = "parse", .shift = FD_PARSE }, - { }, + { .name = "diskutil", .shift = FD_DISKUTIL }, + { .name = "job", .shift = FD_JOB }, + { .name = "mutex", .shift = FD_MUTEX }, + { .name = NULL, }, }; static int set_debug(const char *string) @@ -858,22 +916,38 @@ static int set_debug(const char *string) } log_info("all\n"); return 1; - } else if (!strcmp(string, "all")) { - fio_debug = ~0UL; - return 0; } while ((opt = strsep(&p, ",")) != NULL) { int found = 0; + if (!strncmp(opt, "all", 3)) { + log_info("fio: set all debug options\n"); + fio_debug = ~0UL; + continue; + } + for (i = 0; debug_levels[i].name; i++) { dl = &debug_levels[i]; - if (!strncmp(opt, dl->name, strlen(opt))) { + found = !strncmp(opt, dl->name, strlen(dl->name)); + if (!found) + continue; + + if (dl->shift == FD_JOB) { + opt = strchr(opt, ':'); + if (!opt) { + log_err("fio: missing job number\n"); + break; + } + opt++; + fio_debug_jobno = atoi(opt); + log_info("fio: set debug jobno %d\n", + fio_debug_jobno); + } else { log_info("fio: set debug option %s\n", opt); - found = 1; fio_debug |= (1UL << dl->shift); - break; } + break; } if (!found) @@ -882,7 +956,7 @@ static int set_debug(const char *string) return 0; } #else -static void set_debug(const char *string) +static int set_debug(const char *string) { log_err("fio: debug tracing not included in build\n"); return 1; @@ -896,6 +970,9 @@ static int parse_cmd_line(int argc, char *argv[]) while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) { switch (c) { + case 'a': + smalloc_pool_size = atoi(optarg); + break; case 't': def_timeout = atoi(optarg); break; @@ -1045,5 +1122,11 @@ int parse_options(int argc, char *argv[]) return 1; } + if (def_thread.o.gtod_offload) { + fio_gtod_init(); + fio_gtod_offload = 1; + fio_gtod_cpu = def_thread.o.gtod_cpu; + } + return 0; }