X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=56df3c7582e91ce2f419709672d550d1b3d5173c;hb=b3dc7f075b85e004f8c681ebb8566475017696f3;hp=636e95766fb3555416da03e9a09335596729bd35;hpb=c6441dc9e95cba2a31dec63272917fdf496c75c4;p=fio.git

diff --git a/init.c b/init.c
index 636e9576..56df3c75 100644
--- a/init.c
+++ b/init.c
@@ -22,7 +22,6 @@
 
 #define td_var_offset(var)	((size_t) &((struct thread_data *)0)->var)
 
-static int str_ioengine_cb(void *, const char *);
 static int str_mem_cb(void *, const char *);
 static int str_lockmem_cb(void *, unsigned long *);
 #ifdef FIO_HAVE_IOPRIO
@@ -80,8 +79,8 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "ioengine",
-		.type	= FIO_OPT_STR,
-		.cb	= str_ioengine_cb,
+		.type	= FIO_OPT_STR_STORE,
+		.off1	= td_var_offset(ioengine),
 		.help	= "IO engine to use",
 		.def	= "sync",
 		.posval	= {
@@ -103,6 +102,7 @@ static struct fio_option options[] = {
 #ifdef FIO_HAVE_SYSLET
 			  { .ival = "syslet-rw", },
 #endif
+			  { .ival = "external", },
 			  },
 	},
 	{
@@ -180,6 +180,12 @@ static struct fio_option options[] = {
 		.help	= "Split job workload between this number of files",
 		.def	= "1",
 	},
+	{
+		.name	= "openfiles",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(open_files),
+		.help	= "Number of files to keep open at the same time",
+	},
 	{
 		.name	= "file_service_type",
 		.type	= FIO_OPT_STR,
@@ -394,7 +400,7 @@ static struct fio_option options[] = {
 		.name	= "thinktime_spin",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(thinktime_spin),
-		.help	= "Start thinktime by spinning this amount (usec)",
+		.help	= "Start think time by spinning this amount (usec)",
 		.def	= "0",
 	},
 	{
@@ -529,6 +535,12 @@ static struct fio_option options[] = {
 		.help	= "When using hugepages, specify size of each page",
 		.def	= __stringify(FIO_HUGE_PAGE),
 	},
+	{
+		.name	= "group_reporting",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= td_var_offset(group_reporting),
+		.help	= "Do reporting on a per-group basis",
+	},
 	{
 		.name = NULL,
 	},
@@ -580,7 +592,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 	},
 	{
 		.name		= "cmdhelp",
-		.has_arg	= required_argument,
+		.has_arg	= optional_argument,
 		.val		= 'c',
 	},
 	{
@@ -590,7 +602,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.13";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -607,6 +619,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.
  */
@@ -657,13 +679,13 @@ static void fixup_options(struct thread_data *td)
 		td->iodepth = 1;
 	else {
 		if (!td->iodepth)
-			td->iodepth = td->nr_files;
+			td->iodepth = td->open_files;
 	}
 
 	/*
 	 * only really works for sequential io for now, and with 1 file
 	 */
-	if (td->zone_size && td_random(td) && td->nr_files == 1)
+	if (td->zone_size && td_random(td) && td->open_files == 1)
 		td->zone_size = 0;
 
 	/*
@@ -708,14 +730,26 @@ 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;
+
+	if (td->open_files > td->nr_files || !td->open_files)
+		td->open_files = td->nr_files;
 }
 
 /*
@@ -739,6 +773,20 @@ static char *to_kmg(unsigned int val)
 	return buf;
 }
 
+/* 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;
+}
+
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
@@ -751,6 +799,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	struct stat sb;
 	int numjobs, i;
 	struct fio_file *f;
+	const char *engine;
 
 	/*
 	 * the def_thread is just for options, it's not a real job
@@ -758,7 +807,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td == &def_thread)
 		return 0;
 
-	assert(td->io_ops);
+	engine = get_engine_name(td->ioengine);
+	td->io_ops = load_ioengine(td, engine);
+	if (!td->io_ops) {
+		log_err("fio: failed to load engine %s\n", engine);
+		return 1;
+	}
 
 	if (td->odirect)
 		td->io_ops->flags |= FIO_RAWIO;
@@ -776,7 +830,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td->filename)
 		td->nr_uniq_files = 1;
 	else
-		td->nr_uniq_files = td->nr_files;
+		td->nr_uniq_files = td->open_files;
 
 	if (td->filetype == FIO_TYPE_FILE || td->filename) {
 		char tmp[PATH_MAX];
@@ -795,7 +849,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			len = sprintf(tmp, "%s/", td->directory);
 		}
 
-		td->files = malloc(sizeof(struct fio_file) * td->nr_files);
+		td->files = malloc(sizeof(struct fio_file) * td->open_files);
 
 		for_each_file(td, f, i) {
 			memset(f, 0, sizeof(*f));
@@ -808,7 +862,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			f->file_name = strdup(tmp);
 		}
 	} else {
-		td->nr_files = 1;
+		td->open_files = td->nr_files = 1;
 		td->files = malloc(sizeof(struct fio_file));
 		f = &td->files[0];
 
@@ -822,7 +876,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		f->file_offset = td->start_offset;
 	}
 		
-	fio_sem_init(&td->mutex, 0);
+	td->mutex = fio_sem_init(0);
 
 	td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
 	td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
@@ -1008,17 +1062,6 @@ static int str_mem_cb(void *data, const char *mem)
 	return 0;
 }
 
-static int str_ioengine_cb(void *data, const char *str)
-{
-	struct thread_data *td = data;
-
-	td->io_ops = load_ioengine(td, str);
-	if (td->io_ops)
-		return 0;
-
-	return 1;
-}
-
 static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
 {
 	mlock_size = *val;
@@ -1188,7 +1231,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);