X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=9267f790ca3ac6fbd59a11f2cbf5c3ea1629bb57;hp=cec7bb79d2422b19f79df258b784c0ab033fbc4b;hb=f0d524b045ceef3454cbc66dbfe8ea51db298a62;hpb=a086c25771b195d04651d293f299f0a63f7d2a23

diff --git a/options.c b/options.c
index cec7bb79..9267f790 100644
--- a/options.c
+++ b/options.c
@@ -40,21 +40,16 @@ static int bs_cmp(const void *p1, const void *p2)
 	return bsp1->perc < bsp2->perc;
 }
 
-static int str_bssplit_cb(void *data, const char *input)
+static int bssplit_ddir(struct thread_data *td, int ddir, char *str)
 {
-	struct thread_data *td = data;
-	char *fname, *str, *p;
+	struct bssplit *bssplit;
 	unsigned int i, perc, perc_missing;
 	unsigned int max_bs, min_bs;
 	long long val;
+	char *fname;
 
-	p = str = strdup(input);
-
-	strip_blank_front(&str);
-	strip_blank_end(str);
-
-	td->o.bssplit_nr = 4;
-	td->o.bssplit = malloc(4 * sizeof(struct bssplit));
+	td->o.bssplit_nr[ddir] = 4;
+	bssplit = malloc(4 * sizeof(struct bssplit));
 
 	i = 0;
 	max_bs = 0;
@@ -68,10 +63,9 @@ static int str_bssplit_cb(void *data, const char *input)
 		/*
 		 * grow struct buffer, if needed
 		 */
-		if (i == td->o.bssplit_nr) {
-			td->o.bssplit_nr <<= 1;
-			td->o.bssplit = realloc(td->o.bssplit,
-						td->o.bssplit_nr
+		if (i == td->o.bssplit_nr[ddir]) {
+			td->o.bssplit_nr[ddir] <<= 1;
+			bssplit = realloc(bssplit, td->o.bssplit_nr[ddir]
 						  * sizeof(struct bssplit));
 		}
 
@@ -98,19 +92,19 @@ static int str_bssplit_cb(void *data, const char *input)
 		if (val < min_bs)
 			min_bs = val;
 
-		td->o.bssplit[i].bs = val;
-		td->o.bssplit[i].perc = perc;
+		bssplit[i].bs = val;
+		bssplit[i].perc = perc;
 		i++;
 	}
 
-	td->o.bssplit_nr = i;
+	td->o.bssplit_nr[ddir] = i;
 
 	/*
 	 * Now check if the percentages add up, and how much is missing
 	 */
 	perc = perc_missing = 0;
-	for (i = 0; i < td->o.bssplit_nr; i++) {
-		struct bssplit *bsp = &td->o.bssplit[i];
+	for (i = 0; i < td->o.bssplit_nr[ddir]; i++) {
+		struct bssplit *bsp = &bssplit[i];
 
 		if (bsp->perc == (unsigned char) -1)
 			perc_missing++;
@@ -120,7 +114,7 @@ static int str_bssplit_cb(void *data, const char *input)
 
 	if (perc > 100) {
 		log_err("fio: bssplit percentages add to more than 100%%\n");
-		free(td->o.bssplit);
+		free(bssplit);
 		return 1;
 	}
 	/*
@@ -128,24 +122,58 @@ static int str_bssplit_cb(void *data, const char *input)
 	 * them.
 	 */
 	if (perc_missing) {
-		for (i = 0; i < td->o.bssplit_nr; i++) {
-			struct bssplit *bsp = &td->o.bssplit[i];
+		for (i = 0; i < td->o.bssplit_nr[ddir]; i++) {
+			struct bssplit *bsp = &bssplit[i];
 
 			if (bsp->perc == (unsigned char) -1)
 				bsp->perc = (100 - perc) / perc_missing;
 		}
 	}
 
-	td->o.min_bs[DDIR_READ] = td->o.min_bs[DDIR_WRITE] = min_bs;
-	td->o.max_bs[DDIR_READ] = td->o.max_bs[DDIR_WRITE] = max_bs;
+	td->o.min_bs[ddir] = min_bs;
+	td->o.max_bs[ddir] = max_bs;
 
 	/*
 	 * now sort based on percentages, for ease of lookup
 	 */
-	qsort(td->o.bssplit, td->o.bssplit_nr, sizeof(struct bssplit), bs_cmp);
+	qsort(bssplit, td->o.bssplit_nr[ddir], sizeof(struct bssplit), bs_cmp);
+	td->o.bssplit[ddir] = bssplit;
+	return 0;
+
+}
+
+static int str_bssplit_cb(void *data, const char *input)
+{
+	struct thread_data *td = data;
+	char *str, *p, *odir;
+	int ret = 0;
+
+	p = str = strdup(input);
+
+	strip_blank_front(&str);
+	strip_blank_end(str);
+
+	odir = strchr(str, ',');
+	if (odir) {
+		ret = bssplit_ddir(td, DDIR_WRITE, odir + 1);
+		if (!ret) {
+			*odir = '\0';
+			ret = bssplit_ddir(td, DDIR_READ, str);
+		}
+	} else {
+		char *op;
+
+		op = strdup(str);
+
+		ret = bssplit_ddir(td, DDIR_READ, str);
+		if (!ret)
+			ret = bssplit_ddir(td, DDIR_WRITE, op);
+
+		free(op);
+	}
 
 	free(p);
-	return 0;
+	return ret;
 }
 
 static int str_rw_cb(void *data, const char *str)
@@ -577,7 +605,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(filename),
 		.cb	= str_filename_cb,
-		.prio	= 1, /* must come before "directory" */
+		.prio	= -1, /* must come after "directory" */
 		.help	= "File(s) to use for the workload",
 	},
 	{
@@ -792,6 +820,16 @@ static struct fio_option options[] = {
 		.def	= "4k",
 		.parent = "rw",
 	},
+	{
+		.name	= "ba",
+		.alias	= "blockalign",
+		.type	= FIO_OPT_STR_VAL_INT,
+		.off1	= td_var_offset(ba[DDIR_READ]),
+		.off2	= td_var_offset(ba[DDIR_WRITE]),
+		.minval	= 1,
+		.help	= "IO block offset alignment",
+		.parent	= "rw",
+	},
 	{
 		.name	= "bsrange",
 		.alias	= "blocksize_range",
@@ -1289,6 +1327,13 @@ static struct fio_option options[] = {
 		.help	= "Fsync file after creation",
 		.def	= "1",
 	},
+	{
+		.name	= "create_on_open",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(create_on_open),
+		.help	= "Create files when they are opened for IO",
+		.def	= "0",
+	},
 	{
 		.name	= "cpuload",
 		.type	= FIO_OPT_INT,