X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=options.c;h=1886b23cd010b803b297fdae04a42b0c8684de69;hb=1c725e7021966a25ad1943ef396cf2c9990a7c55;hp=ac41565c8677783aaa222ccf15929a74c1b7b39a;hpb=e7b24047454305dd61c9b4f9f73628a03c240a9f;p=fio.git

diff --git a/options.c b/options.c
index ac41565c..1886b23c 100644
--- a/options.c
+++ b/options.c
@@ -204,7 +204,8 @@ static int str_bssplit_cb(void *data, const char *input)
 			ret = bssplit_ddir(&td->o, DDIR_TRIM, op);
 			free(op);
 		}
-		ret = bssplit_ddir(&td->o, DDIR_READ, str);
+		if (!ret)
+			ret = bssplit_ddir(&td->o, DDIR_READ, str);
 	}
 
 	free(p);
@@ -2818,7 +2819,8 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.group	= FIO_OPT_G_RATE,
 	},
 	{
-		.name	= "ratemin",
+		.name	= "rate_min",
+		.alias	= "ratemin",
 		.lname	= "I/O min rate",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(ratemin[DDIR_READ]),
@@ -2856,19 +2858,30 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.group	= FIO_OPT_G_RATE,
 	},
 	{
-		.name	= "rate_poisson",
-		.lname	= "simulate requests under Poisson process",
-		.type	= FIO_OPT_BOOL,
-		.off1	= td_var_offset(poisson_rate),
-		.help	= "With rate limit, simulate requests that follow Poisson process",
-		.def	= "0",
-		.parent = "rate",
-		.hide	= 1,
+		.name	= "rate_process",
+		.lname	= "Rate Process",
+		.type	= FIO_OPT_STR,
+		.off1	= td_var_offset(rate_process),
+		.help	= "What process controls how rated IO is managed",
+		.def	= "linear",
 		.category = FIO_OPT_C_IO,
 		.group	= FIO_OPT_G_RATE,
+		.posval = {
+			  { .ival = "linear",
+			    .oval = RATE_PROCESS_LINEAR,
+			    .help = "Linear rate of IO",
+			  },
+			  {
+			    .ival = "poisson",
+			    .oval = RATE_PROCESS_POISSON,
+			    .help = "Rate follows Poisson process",
+			  },
+		},
+		.parent = "rate",
 	},
 	{
-		.name	= "ratecycle",
+		.name	= "rate_cycle",
+		.alias	= "ratecycle",
 		.lname	= "I/O rate cycle",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(ratecycle),