Don't start new groups for numjobs=

[fio.git] / init.c

diff --git a/init.c b/init.c
index 84c312f9d2194cc878dff29137003bf0d0f05ee5..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.28";
+static char fio_version_string[] = "fio 1.32";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -233,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);
@@ -364,17 +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)
+       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;
-               }
+               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;
 }
 
@@ -547,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++;
        }