Fio 1.35
[fio.git] / init.c
diff --git a/init.c b/init.c
index a8acdc04b4e1be49fc080be3f0a9a17e09281cef..cc0f3ba8a45b53ca0c4d7f17c5644146300dd82d 100644 (file)
--- 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.23";
+static char fio_version_string[] = "fio 1.35";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -174,38 +175,47 @@ 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] &&
+               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.
@@ -214,20 +224,15 @@ static int fixup_options(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
 
-#ifndef FIO_HAVE_CPU_AFFINITY
-       if (td->o.gtod_cpu) {
-               log_err("fio: platform must support CPU affinity for"
-                       "gettimeofday() offloading\n");
-               return 1;
+#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
 
-       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);
@@ -257,11 +262,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]) &&
+           !td->o.norandommap) {
+               log_err("fio: Any use of blockalign= turns off randommap\n");
+               td->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))
@@ -300,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;
        }
@@ -324,6 +350,13 @@ 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->io_ops->flags & FIO_PIPEIO)
+                       log_info("fio: cannot pre-read files with an IO engine"
+                                " that isn't seekable. Pre-read disabled.\n");
+       }
+
        return 0;
 }
 
@@ -375,13 +408,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);
@@ -390,30 +442,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;
 }
 
@@ -492,8 +529,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++;
        }
@@ -567,6 +603,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;
                }
 
@@ -589,7 +626,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)
@@ -872,6 +909,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 <jens.axboe@oracle.com>\n");
 }
 
 #ifdef FIO_INC_DEBUG
@@ -886,6 +924,7 @@ 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 = NULL, },
 };
 
@@ -1107,7 +1146,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;
        }