X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=f72112795ce09184c385d3ea5f1517c1bc9ab183;hp=d6fc930cca36772fa3b2d28e02ec305e07154321;hb=755c31896364ad2887c07e0383ce639d1f5b52ab;hpb=e69d6e30c8b82082cb440e926037bc1a91710856

diff --git a/init.c b/init.c
index d6fc930c..f7211279 100644
--- a/init.c
+++ b/init.c
@@ -20,7 +20,7 @@
 #include "filehash.h"
 #include "verify.h"
 
-static char fio_version_string[] = "fio 1.27.4";
+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,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++;
 	}
@@ -920,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
@@ -1156,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;
 	}