X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=2a1ee149cc85dc15601a7ad86ec8a01021987d3c;hp=1e4432ec7131f4f4e850761a9475bf914be3b05a;hb=724e4435c1374e97309b122429ad9291744966c0;hpb=0a839f308177e95c4c45c41ee1d4fa2b8f231f24

diff --git a/init.c b/init.c
index 1e4432ec..2a1ee149 100644
--- a/init.c
+++ b/init.c
@@ -17,13 +17,14 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.16";
+static char fio_version_string[] = "fio 1.17.1";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
 static int dump_cmdline;
+static int read_only;
 
 struct thread_data def_thread;
 struct thread_data *threads = NULL;
@@ -89,7 +90,12 @@ static struct option long_options[FIO_NR_OPTIONS] = {
 	{
 		.name		= "showcmd",
 		.has_arg	= no_argument,
-		.val		= 's'
+		.val		= 's',
+	},
+	{
+		.name		= "readonly",
+		.has_arg	= no_argument,
+		.val		= 'r',
 	},
 	{
 		.name		= NULL,
@@ -180,6 +186,11 @@ static int fixup_options(struct thread_data *td)
 {
 	struct thread_options *o = &td->o;
 
+	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->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
 		o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
 
@@ -222,9 +233,6 @@ static int fixup_options(struct thread_data *td)
 	if (!o->file_size_high)
 		o->file_size_high = o->file_size_low;
 
-	if (td_read(td) && !td_rw(td))
-		o->verify = 0;
-
 	if (o->norandommap && o->verify != VERIFY_NONE) {
 		log_err("fio: norandommap given, verify disabled\n");
 		o->verify = VERIFY_NONE;
@@ -564,8 +572,12 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 	}
 
 	string = malloc(4096);
-	name = malloc(256);
-	memset(name, 0, 256);
+
+	/*
+	 * it's really 256 + small bit, 280 should suffice
+	 */
+	name = malloc(280);
+	memset(name, 0, 280);
 
 	stonewall = stonewall_flag;
 	do {
@@ -579,8 +591,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 		if (is_empty_or_comment(p))
 			continue;
 		if (sscanf(p, "[%255s]", name) != 1) {
-			log_err("fio: option <%s> outside of job section\n", p);
-			continue;
+			log_err("fio: option <%s> outside of [] job section\n", p);
+			break;
 		}
 
 		global = !strncmp(name, "global", 6);
@@ -655,10 +667,7 @@ static int fill_def_thread(void)
 {
 	memset(&def_thread, 0, sizeof(def_thread));
 
-	if (fio_getaffinity(getpid(), &def_thread.o.cpumask) == -1) {
-		perror("sched_getaffinity");
-		return 1;
-	}
+	fio_getaffinity(getpid(), &def_thread.o.cpumask);
 
 	/*
 	 * fill default options
@@ -770,6 +779,9 @@ static int parse_cmd_line(int argc, char *argv[])
 		case 's':
 			dump_cmdline = 1;
 			break;
+		case 'r':
+			read_only = 1;
+			break;
 		case 'v':
 			printf("%s\n", fio_version_string);
 			exit(0);