X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=4bb917235930b53213e21877164e7f294a1d9ef5;hb=3f5bf577570e77231a245c3a90b4002244d1382e;hp=305f6605f08ab7d749ea415d78a04fa518ba1b03;hpb=c103f2440db0ceab0eb6c0d6669be285766fb495;p=fio.git

diff --git a/init.c b/init.c
index 305f6605..4bb91723 100644
--- a/init.c
+++ b/init.c
@@ -20,7 +20,7 @@
 #include "filehash.h"
 #include "verify.h"
 
-static char fio_version_string[] = "fio 1.29-rc1";
+static char fio_version_string[] = "fio 1.35";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -126,11 +126,36 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
 		.has_arg	= required_argument,
 		.val		= 'a',
 	},
+	{
+		.name		= "profile",
+		.has_arg	= required_argument,
+		.val		= 'p',
+	},
 	{
 		.name		= NULL,
 	},
 };
 
+static const char *tiobench_opts[] = {
+	"buffered=0", "size=4*1024*$mb_memory", "bs=4k", "timeout=600",
+	"numjobs=4", "group_reporting", "thread", "overwrite=1",
+	"filename=.fio.tio.1:.fio.tio.2:.fio.tio.3:.fio.tio.4",
+	"name=seqwrite", "rw=write", "end_fsync=1",
+	"name=randwrite", "stonewall", "rw=randwrite", "end_fsync=1",
+	"name=seqread", "stonewall", "rw=read",
+	"name=randread", "stonewall", "rw=randread", NULL,
+};
+
+static const char **fio_prof_strings[PROFILE_END] = {
+	NULL,
+	tiobench_opts,
+};
+
+static const char *profiles[PROFILE_END] = {
+	"none",
+	"tiobench",
+};
+
 FILE *get_f_out()
 {
 	return f_out;
@@ -350,17 +375,13 @@ static int fixup_options(struct thread_data *td)
 	if (td->o.verify != VERIFY_NONE)
 		td->o.refill_buffers = 1;
 
-	if (td->o.pre_read)
+	if (td->o.pre_read) {
 		td->o.invalidate_cache = 0;
-
-	if (td->o.mem_align) {
-		if (td->o.odirect && !is_power_of_2(td->o.mem_align)) {
-			log_err("fio: given IO mem alignment conflicts with"
-					" direct=1. Resetting.\n");
-			td->o.mem_align = page_mask;
-		}
+		if (td->io_ops->flags & FIO_PIPEIO)
+			log_info("fio: cannot pre-read files with an IO engine"
+				 " that isn't seekable. Pre-read disabled.\n");
 	}
-			
+
 	return 0;
 }
 
@@ -533,8 +554,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
 	td->ddir_nr = td->o.ddir_nr;
 
-	if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group)
-	     && prev_group_jobs) {
+	if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
 		prev_group_jobs = 0;
 		groupid++;
 	}
@@ -997,6 +1017,57 @@ static int set_debug(const char *string)
 }
 #endif
 
+static int load_profile(const char *profile)
+{
+	struct thread_data *td, *td_parent;
+	const char **o;
+	int i, in_global = 1;
+	char jobname[32];
+
+	dprint(FD_PARSE, "loading profile %s\n", profile);
+
+	for (i = 0; i < PROFILE_END; i++) {
+		if (!strcmp(profile, profiles[i]))
+			break;
+	}
+
+	if (i == PROFILE_END) {
+		log_err("fio: unknown profile %s\n", profile);
+		return 1;
+	}
+
+	o = fio_prof_strings[i];
+	if (!o)
+		return 0;
+
+	i = 0;
+	td_parent = td = NULL;
+	while (o[i]) {
+		if (!strncmp(o[i], "name", 4)) {
+			in_global = 0;
+			if (td)
+				add_job(td, jobname, 0);
+			td = NULL;
+			sprintf(jobname, "%s", o[i] + 5);
+		}
+		if (in_global && !td_parent)
+			td_parent = get_new_job(1, &def_thread);
+		else if (!in_global && !td) {
+			if (!td_parent)
+				td_parent = &def_thread;
+			td = get_new_job(0, td_parent);
+		}
+		if (in_global)
+			fio_options_parse(td_parent, (char **) &o[i], 1);
+		else
+			fio_options_parse(td, (char **) &o[i], 1);
+		i++;
+	}
+	if (td)
+		add_job(td, jobname, 0);
+	return 0;
+}
+
 static int parse_cmd_line(int argc, char *argv[])
 {
 	struct thread_data *td = NULL;
@@ -1063,6 +1134,10 @@ static int parse_cmd_line(int argc, char *argv[])
 				free(job_section);
 			job_section = strdup(optarg);
 			break;
+		case 'p':
+			if (load_profile(optarg))
+				do_exit++;
+			break;
 		case FIO_GETOPT_JOB: {
 			const char *opt = l_opts[lidx].name;
 			char *val = optarg;