X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=d3304ebff579b2e147fbb741cc30c6b95a6de26e;hp=02e544a004290130e56a5d30ab430514eaeeb5a8;hb=b767c7f8e3fd8efff51debe39149c65028cf963d;hpb=fd4442b8c33de3bad7d4d31df75e3109900ac70e diff --git a/init.c b/init.c index 02e544a0..d3304ebf 100644 --- 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.1"; #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,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; } @@ -539,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++; }