X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=init.c;h=2259edf5afee0b3396b89f245ae0c1223afe0726;hb=b58cf3dc6945d661bd5c40c0856a99e0f9c8a9e6;hp=8efb24ab58bf17428797e364e045ecb490d6f1eb;hpb=10cad1aa7af1c47be6655cff0438c46843964294;p=fio.git

diff --git a/init.c b/init.c
index 8efb24ab..2259edf5 100644
--- a/init.c
+++ b/init.c
@@ -103,6 +103,7 @@ static struct fio_option options[] = {
 #ifdef FIO_HAVE_SYSLET
 			  { .ival = "syslet-rw", },
 #endif
+			  { .ival = "external", },
 			  },
 	},
 	{
@@ -112,6 +113,12 @@ static struct fio_option options[] = {
 		.help	= "Amount of IO buffers to keep in flight",
 		.def	= "1",
 	},
+	{
+		.name	= "iodepth_batch",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(iodepth_batch),
+		.help	= "Number of IO to submit in one go",
+	},
 	{
 		.name	= "iodepth_low",
 		.type	= FIO_OPT_INT,
@@ -574,7 +581,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 	},
 	{
 		.name		= "cmdhelp",
-		.has_arg	= required_argument,
+		.has_arg	= optional_argument,
 		.val		= 'c',
 	},
 	{
@@ -584,7 +591,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 
 static int def_timeout = 0;
 
-static char fio_version_string[] = "fio 1.11";
+static char fio_version_string[] = "fio 1.12";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -601,6 +608,16 @@ FILE *f_err = NULL;
 static int write_lat_log = 0;
 int write_bw_log = 0;
 
+FILE *get_f_out()
+{
+	return f_out;
+}
+
+FILE *get_f_err()
+{
+	return f_err;
+}
+
 /*
  * Return a free job structure.
  */
@@ -702,8 +719,23 @@ static void fixup_options(struct thread_data *td)
 	/*
 	 * The low water mark cannot be bigger than the iodepth
 	 */
-	if (td->iodepth_low > td->iodepth || !td->iodepth_low)
-		td->iodepth_low = td->iodepth;
+	if (td->iodepth_low > td->iodepth || !td->iodepth_low) {
+		/*
+		 * syslet work around - if the workload is sequential,
+		 * we want to let the queue drain all the way down to
+		 * avoid seeking between async threads
+		 */
+		if (!strcmp(td->io_ops->name, "syslet-rw") && !td_random(td))
+			td->iodepth_low = 1;
+		else
+			td->iodepth_low = td->iodepth;
+	}
+
+	/*
+	 * If batch number isn't set, default to the same as iodepth
+	 */
+	if (td->iodepth_batch > td->iodepth || !td->iodepth_batch)
+		td->iodepth_batch = td->iodepth;
 }
 
 /*
@@ -996,11 +1028,26 @@ static int str_mem_cb(void *data, const char *mem)
 	return 0;
 }
 
+/* External engines are specified by "external:name.o") */
+static const char *get_engine_name(const char *str)
+{
+	char *p = strstr(str, ":");
+
+	if (!p)
+		return str;
+
+	p++;
+	strip_blank_front(&p);
+	strip_blank_end(p);
+	return p;
+}
+
 static int str_ioengine_cb(void *data, const char *str)
 {
 	struct thread_data *td = data;
+	const char *name = get_engine_name(str);
 
-	td->io_ops = load_ioengine(td, str);
+	td->io_ops = load_ioengine(td, name);
 	if (td->io_ops)
 		return 0;
 
@@ -1176,7 +1223,7 @@ static int parse_cmd_line(int argc, char *argv[])
 	struct thread_data *td = NULL;
 	int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
 
-	while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) {
+	while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
 		switch (c) {
 		case 't':
 			def_timeout = atoi(optarg);