Fio 1.34

[fio.git] / init.c

diff --git a/init.c b/init.c
index d40009d2b75f6cf343e3f867c237e290a1eea8f0..18fefee4a4a57ea1e2809666de1fd5d592ec3401 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.34";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -350,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;
 }
 
@@ -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++;
        }