X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=ae7a4d2527abd854cbf397f7bd8974f78d09ff1a;hp=3142d8ca7a8dd9c32e606ea6bc2c7d49843f8b15;hb=refs%2Ftags%2Ffio-1.41;hpb=f356d01d0cf8fec2ee58f66a9b5c00c93defbc47 diff --git a/init.c b/init.c index 3142d8ca..ae7a4d25 100644 --- a/init.c +++ b/init.c @@ -18,8 +18,10 @@ #include "parse.h" #include "smalloc.h" #include "filehash.h" +#include "verify.h" +#include "profile.h" -static char fio_version_string[] = "fio 1.23"; +static char fio_version_string[] = "fio 1.41"; #define FIO_RANDSEED (0xb1899bedUL) @@ -37,6 +39,7 @@ unsigned long long mlock_size = 0; FILE *f_out = NULL; FILE *f_err = NULL; char *job_section = NULL; +char *exec_profile = NULL; int write_bw_log = 0; int read_only = 0; @@ -125,6 +128,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'a', }, + { + .name = "profile", + .has_arg = required_argument, + .val = 'p', + }, { .name = NULL, }, @@ -155,9 +163,13 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) td = &threads[thread_number++]; *td = *parent; + td->o.uid = td->o.gid = -1U; + dup_files(td, parent); options_mem_dupe(td); + profile_add_hooks(td); + td->thread_number = thread_number; return td; } @@ -166,6 +178,8 @@ static void put_job(struct thread_data *td) { if (td == &def_thread) return; + + profile_td_exit(td); if (td->error) log_info("fio: %s\n", td->verror); @@ -174,38 +188,45 @@ static void put_job(struct thread_data *td) thread_number--; } -static int setup_rate(struct thread_data *td) +static int __setup_rate(struct thread_data *td, enum fio_ddir ddir) { - unsigned long nr_reads_per_msec; - unsigned long long rate; - unsigned int bs; - - if (!td->o.rate && !td->o.rate_iops) - return 0; + unsigned int bs = td->o.min_bs[ddir]; + unsigned long long bytes_per_sec; - if (td_rw(td)) - bs = td->o.rw_min_bs; - else if (td_read(td)) - bs = td->o.min_bs[DDIR_READ]; + if (td->o.rate[ddir]) + bytes_per_sec = td->o.rate[ddir]; else - bs = td->o.min_bs[DDIR_WRITE]; + bytes_per_sec = td->o.rate_iops[ddir] * bs; - if (td->o.rate) { - rate = td->o.rate; - nr_reads_per_msec = (rate * 1024 * 1000LL) / bs; - } else - nr_reads_per_msec = td->o.rate_iops * 1000UL; - - if (!nr_reads_per_msec) { + if (!bytes_per_sec) { log_err("rate lower than supported\n"); return -1; } - td->rate_usec_cycle = 1000000000ULL / nr_reads_per_msec; - td->rate_pending_usleep = 0; + td->rate_nsec_cycle[ddir] = 1000000000ULL / bytes_per_sec; + td->rate_pending_usleep[ddir] = 0; return 0; } +static int setup_rate(struct thread_data *td) +{ + int ret = 0; + + if (td->o.rate[DDIR_READ] || td->o.rate_iops[DDIR_READ]) + ret = __setup_rate(td, DDIR_READ); + if (td->o.rate[DDIR_WRITE] || td->o.rate_iops[DDIR_WRITE]) + ret |= __setup_rate(td, DDIR_WRITE); + + return ret; +} + +static int fixed_block_size(struct thread_options *o) +{ + return o->min_bs[DDIR_READ] == o->max_bs[DDIR_READ] && + o->min_bs[DDIR_WRITE] == o->max_bs[DDIR_WRITE] && + o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE]; +} + /* * Lazy way of fixing up options that depend on each other. We could also * define option callback handlers, but this is easier. @@ -215,28 +236,14 @@ static int fixup_options(struct thread_data *td) struct thread_options *o = &td->o; #ifndef FIO_HAVE_PSHARED_MUTEX - if (!td->o.use_thread) { + if (!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; + 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->write_iolog_file && o->read_iolog_file) { log_err("fio: read iolog overrides write_iolog\n"); free(o->write_iolog_file); @@ -266,11 +273,28 @@ static int fixup_options(struct thread_data *td) o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]); + /* + * For random IO, allow blockalign offset other than min_bs. + */ + if (!o->ba[DDIR_READ] || !td_random(td)) + o->ba[DDIR_READ] = o->min_bs[DDIR_READ]; + if (!o->ba[DDIR_WRITE] || !td_random(td)) + o->ba[DDIR_WRITE] = o->min_bs[DDIR_WRITE]; + + if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] || + o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) && + !o->norandommap) { + log_err("fio: Any use of blockalign= turns off randommap\n"); + o->norandommap = 1; + } + if (!o->file_size_high) o->file_size_high = o->file_size_low; - if (o->norandommap && o->verify != VERIFY_NONE) { - log_err("fio: norandommap given, verify disabled\n"); + if (o->norandommap && o->verify != VERIFY_NONE + && !fixed_block_size(o)) { + log_err("fio: norandommap given for variable block sizes, " + "verify disabled\n"); o->verify = VERIFY_NONE; } if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO)) @@ -309,11 +333,15 @@ static int fixup_options(struct thread_data *td) if (o->open_files > o->nr_files || !o->open_files) o->open_files = o->nr_files; - if ((o->rate && o->rate_iops) || (o->ratemin && o->rate_iops_min)) { + if (((o->rate[0] + o->rate[1]) && (o->rate_iops[0] + o->rate_iops[1]))|| + ((o->ratemin[0] + o->ratemin[1]) && (o->rate_iops_min[0] + + o->rate_iops_min[1]))) { log_err("fio: rate and rate_iops are mutually exclusive\n"); return 1; } - if ((o->rate < o->ratemin) || (o->rate_iops < o->rate_iops_min)) { + if ((o->rate[0] < o->ratemin[0]) || (o->rate[1] < o->ratemin[1]) || + (o->rate_iops[0] < o->rate_iops_min[0]) || + (o->rate_iops[1] < o->rate_iops_min[1])) { log_err("fio: minimum rate exceeds rate\n"); return 1; } @@ -326,12 +354,34 @@ static int fixup_options(struct thread_data *td) if (o->fill_device && !o->size) o->size = -1ULL; - if (td_rw(td) && td->o.verify != VERIFY_NONE) + if (td_rw(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; + if (o->verify != VERIFY_NONE) { + o->refill_buffers = 1; + if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] && + !o->verify_interval) + o->verify_interval = o->min_bs[DDIR_WRITE]; + } + + if (o->pre_read) { + o->invalidate_cache = 0; + if (td->io_ops->flags & FIO_PIPEIO) + log_info("fio: cannot pre-read files with an IO engine" + " that isn't seekable. Pre-read disabled.\n"); + } + +#ifndef FIO_HAVE_FDATASYNC + if (o->fdatasync_blocks) { + log_info("fio: this platform does not support fdatasync()" + " falling back to using fsync(). Use the 'fsync'" + " option instead of 'fdatasync' to get rid of" + " this warning\n"); + o->fsync_blocks = o->fdatasync_blocks; + o->fdatasync_blocks = 0; + } +#endif return 0; } @@ -384,13 +434,32 @@ static int exists_and_not_file(const char *filename) return 1; } +void td_fill_rand_seeds(struct thread_data *td) +{ + os_random_seed(td->rand_seeds[0], &td->bsrange_state); + os_random_seed(td->rand_seeds[1], &td->verify_state); + os_random_seed(td->rand_seeds[2], &td->rwmix_state); + + if (td->o.file_service_type == FIO_FSERVICE_RANDOM) + os_random_seed(td->rand_seeds[3], &td->next_file_state); + + os_random_seed(td->rand_seeds[5], &td->file_size_state); + + if (!td_random(td)) + return; + + if (td->o.rand_repeatable) + td->rand_seeds[4] = FIO_RANDSEED * td->thread_number; + + os_random_seed(td->rand_seeds[4], &td->random_state); +} + /* * Initialize the various random states we need (random io, block size ranges, * read/write mix, etc). */ static int init_random_state(struct thread_data *td) { - unsigned long seeds[6]; int fd; fd = open("/dev/urandom", O_RDONLY); @@ -399,30 +468,15 @@ static int init_random_state(struct thread_data *td) return 1; } - if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) { + if (read(fd, td->rand_seeds, sizeof(td->rand_seeds)) < + (int) sizeof(td->rand_seeds)) { td_verror(td, EIO, "read"); close(fd); return 1; } close(fd); - - os_random_seed(seeds[0], &td->bsrange_state); - os_random_seed(seeds[1], &td->verify_state); - os_random_seed(seeds[2], &td->rwmix_state); - - if (td->o.file_service_type == FIO_FSERVICE_RANDOM) - os_random_seed(seeds[3], &td->next_file_state); - - os_random_seed(seeds[5], &td->file_size_state); - - if (!td_random(td)) - return 0; - - if (td->o.rand_repeatable) - seeds[4] = FIO_RANDSEED * td->thread_number; - - os_random_seed(seeds[4], &td->random_state); + td_fill_rand_seeds(td); return 0; } @@ -454,6 +508,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) return 0; } + if (profile_td_init(td)) + return 1; + engine = get_engine_name(td->o.ioengine); td->io_ops = load_ioengine(td, engine); if (!td->io_ops) { @@ -501,8 +558,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX; td->ddir_nr = td->o.ddir_nr; - if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group) - && prev_group_jobs) { + if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) { prev_group_jobs = 0; groupid++; } @@ -576,6 +632,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (file_alloced) { td_new->o.filename = NULL; td_new->files_index = 0; + td_new->files_size = 0; td_new->files = NULL; } @@ -591,6 +648,43 @@ err: return -1; } +/* + * Parse as if 'o' was a command line + */ +void add_job_opts(const char **o) +{ + struct thread_data *td, *td_parent; + int i, in_global = 1; + char jobname[32]; + + i = 0; + td_parent = td = NULL; + while (o[i]) { + if (!strncmp(o[i], "name", 4)) { + in_global = 0; + if (td) + add_job(td, jobname, 0); + td = NULL; + sprintf(jobname, "%s", o[i] + 5); + } + if (in_global && !td_parent) + td_parent = get_new_job(1, &def_thread); + else if (!in_global && !td) { + if (!td_parent) + td_parent = &def_thread; + td = get_new_job(0, td_parent); + } + if (in_global) + fio_options_parse(td_parent, (char **) &o[i], 1); + else + fio_options_parse(td, (char **) &o[i], 1); + i++; + } + + if (td) + add_job(td, jobname, 0); +} + static int skip_this_section(const char *name) { if (!job_section) @@ -598,7 +692,7 @@ static int skip_this_section(const char *name) if (!strncmp(name, "global", 6)) return 0; - return strncmp(job_section, name, strlen(job_section)); + return strcmp(job_section, name); } static int is_empty_or_comment(char *line) @@ -682,6 +776,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag) break; } + name[strlen(name) - 1] = '\0'; + if (skip_this_section(name)) { inside_skip = 1; continue; @@ -690,8 +786,6 @@ static int parse_jobs_ini(char *file, int stonewall_flag) global = !strncmp(name, "global", 6); - name[strlen(name) - 1] = '\0'; - if (dump_cmdline) { if (first_sect) log_info("fio "); @@ -787,9 +881,6 @@ static int fill_def_thread(void) fio_fill_default_options(&def_thread); def_thread.o.timeout = def_timeout; - def_thread.o.write_bw_log = write_bw_log; - def_thread.o.write_lat_log = write_lat_log; - return 0; } @@ -881,6 +972,8 @@ static void usage(const char *name) 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"); + printf("\nFio was written by Jens Axboe "); + printf("\n Jens Axboe \n"); } #ifdef FIO_INC_DEBUG @@ -895,6 +988,9 @@ struct debug_level debug_levels[] = { { .name = "parse", .shift = FD_PARSE }, { .name = "diskutil", .shift = FD_DISKUTIL }, { .name = "job", .shift = FD_JOB }, + { .name = "mutex", .shift = FD_MUTEX }, + { .name = "profile", .shift = FD_PROFILE }, + { .name = "time", .shift = FD_TIME }, { .name = NULL, }, }; @@ -978,7 +1074,7 @@ static int parse_cmd_line(int argc, char *argv[]) case 'l': write_lat_log = 1; break; - case 'w': + case 'b': write_bw_log = 1; break; case 'o': @@ -1028,6 +1124,9 @@ static int parse_cmd_line(int argc, char *argv[]) free(job_section); job_section = strdup(optarg); break; + case 'p': + exec_profile = strdup(optarg); + break; case FIO_GETOPT_JOB: { const char *opt = l_opts[lidx].name; char *val = optarg; @@ -1115,8 +1214,10 @@ int parse_options(int argc, char *argv[]) if (!thread_number) { if (dump_cmdline) return 0; + if (exec_profile) + return 0; - log_err("No jobs defined(s)\n"); + log_err("No jobs defined(s)\n\n"); usage(argv[0]); return 1; }