X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=d40009d2b75f6cf343e3f867c237e290a1eea8f0;hp=80d098dd9159a6d926a8c53113946522c10d0084;hb=29d43ff9b1f342fe6658b17f0e349afcb6b76014;hpb=2b7a01d01ea19f6e4090c7a8280bc6bf983e781f diff --git a/init.c b/init.c index 80d098dd..d40009d2 100644 --- a/init.c +++ b/init.c @@ -18,8 +18,9 @@ #include "parse.h" #include "smalloc.h" #include "filehash.h" +#include "verify.h" -static char fio_version_string[] = "fio 1.24"; +static char fio_version_string[] = "fio 1.28"; #define FIO_RANDSEED (0xb1899bedUL) @@ -174,38 +175,40 @@ 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 int bs = td->o.min_bs[ddir]; unsigned long long rate; - unsigned int bs; - - if (!td->o.rate && !td->o.rate_iops) - return 0; + unsigned long ios_per_msec; - if (td_rw(td)) - bs = td->o.rw_min_bs; - else if (td_read(td)) - bs = td->o.min_bs[DDIR_READ]; - else - bs = td->o.min_bs[DDIR_WRITE]; - - if (td->o.rate) { - rate = td->o.rate; - nr_reads_per_msec = (rate * 1024 * 1000LL) / bs; + if (td->o.rate[ddir]) { + rate = td->o.rate[ddir]; + ios_per_msec = (rate * 1000LL) / bs; } else - nr_reads_per_msec = td->o.rate_iops * 1000UL; + ios_per_msec = td->o.rate_iops[ddir] * 1000UL; - if (!nr_reads_per_msec) { + if (!ios_per_msec) { 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_usec_cycle[ddir] = 1000000000ULL / ios_per_msec; + 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] && @@ -230,20 +233,6 @@ static int fixup_options(struct thread_data *td) } #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); @@ -333,11 +322,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; } @@ -357,6 +350,17 @@ static int fixup_options(struct thread_data *td) if (td->o.verify != VERIFY_NONE) td->o.refill_buffers = 1; + if (td->o.pre_read) + td->o.invalidate_cache = 0; + + if (td->o.mem_align) { + if (td->o.odirect && !is_power_of_2(td->o.mem_align)) { + log_err("fio: given IO mem alignment conflicts with" + " direct=1. Resetting.\n"); + td->o.mem_align = page_mask; + } + } + return 0; } @@ -408,13 +412,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); @@ -423,30 +446,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; } @@ -906,6 +914,7 @@ 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 \n"); } #ifdef FIO_INC_DEBUG @@ -1142,7 +1151,7 @@ int parse_options(int argc, char *argv[]) if (dump_cmdline) return 0; - log_err("No jobs defined(s)\n"); + log_err("No jobs defined(s)\n\n"); usage(argv[0]); return 1; }