Don't start new groups for numjobs=

[fio.git] / init.c

diff --git a/init.c b/init.c
index 6be72c1f28c4256b83422e2b4b7b4d23515af205..f72112795ce09184c385d3ea5f1517c1bc9ab183 100644 (file)
--- a/init.c
+++ b/init.c
@@ -20,7 +20,7 @@
 #include "filehash.h"
 #include "verify.h"
 
-static char fio_version_string[] = "fio 1.27";
+static char fio_version_string[] = "fio 1.32";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -175,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;
-
-       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];
+       unsigned long ios_per_msec;
 
-       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] &&
@@ -231,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);
@@ -334,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;
        }
@@ -358,8 +350,12 @@ static int fixup_options(struct thread_data *td)
        if (td->o.verify != VERIFY_NONE)
                td->o.refill_buffers = 1;
 
-       if (td->o.pre_read)
+       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;
 }
@@ -533,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++;
        }
@@ -914,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
@@ -1150,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;
        }