X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio-ini.c;h=b360e9715ba169b215a6f2cd31115415c6a75fb5;hp=c94062279989285ed20a0326e2297f86bf94029b;hb=4785f99523f5c69635eb4bd826f25cd2e264cda7;hpb=0af7b542b69af5ab2400a9960a5bcde82c05723f

diff --git a/fio-ini.c b/fio-ini.c
index c9406227..b360e971 100644
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -37,7 +37,7 @@
 #define DEF_ZONE_SIZE		(0)
 #define DEF_ZONE_SKIP		(0)
 
-static char fio_version_string[] = "fio 1.1";
+static char fio_version_string[] = "fio 1.3";
 
 static int repeatable = DEF_RAND_REPEAT;
 static char *ini_file;
@@ -164,7 +164,8 @@ static void put_job(struct thread_data *td)
 static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 		   int prio)
 {
-	char *ddir_str[] = { "read", "write", "randread", "randwrite" };
+	char *ddir_str[] = { "read", "write", "randread", "randwrite",
+			     "rw", NULL, "randrw" };
 	struct stat sb;
 	int numjobs, ddir;
 
@@ -213,9 +214,9 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 
 	if (td->filetype == FIO_TYPE_FILE) {
 		if (td->directory[0] != '\0')
-			sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->thread_number);
+			sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->jobnum);
 		else
-			sprintf(td->file_name, "%s.%d", jobname, td->thread_number);
+			sprintf(td->file_name, "%s.%d", jobname, td->jobnum);
 	} else
 		strcpy(td->file_name, jobname);
 
@@ -229,7 +230,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 		td->min_bs = td->bs;
 	if (td->max_bs == -1U)
 		td->max_bs = td->bs;
-	if (td_read(td))
+	if (td_read(td) && !td_rw(td))
 		td->verify = 0;
 
 	if (td->stonewall && td->thread_number > 1)
@@ -247,7 +248,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 	if (write_bw_log)
 		setup_log(&td->bw_log);
 
-	ddir = td->ddir + (!td->sequential << 1);
+	ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
 	printf("Client%d (g=%d): rw=%s, prio=%d/%d, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], prioclass, prio, td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
 
 	/*
@@ -263,6 +264,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 
 		td_new->numjobs = 1;
 		td_new->stonewall = 0;
+		td_new->jobnum = numjobs;
 
 		if (add_job(td_new, jobname, prioclass, prio))
 			goto err;
@@ -539,6 +541,16 @@ static int str_rw_cb(struct thread_data *td, char *mem)
 		td->ddir = DDIR_WRITE;
 		td->sequential = 0;
 		return 0;
+	} else if (!strncmp(mem, "rw", 2)) {
+		td->ddir = 0;
+		td->iomix = 1;
+		td->sequential = 1;
+		return 0;
+	} else if (!strncmp(mem, "randrw", 6)) {
+		td->ddir = 0;
+		td->iomix = 1;
+		td->sequential = 0;
+		return 0;
 	}
 
 	fprintf(stderr, "bad data direction: %s\n", mem);
@@ -845,6 +857,7 @@ static int fill_def_thread(void)
 	 * fill globals
 	 */
 	def_thread.ddir = DDIR_READ;
+	def_thread.iomix = 0;
 	def_thread.bs = DEF_BS;
 	def_thread.min_bs = -1;
 	def_thread.max_bs = -1;
@@ -874,11 +887,25 @@ static int fill_def_thread(void)
 	return 0;
 }
 
+static void usage(char *name)
+{
+	printf("%s\n", fio_version_string);
+	printf("\t-s IO is sequential\n");
+	printf("\t-b Block size in KiB for each IO\n");
+	printf("\t-t Runtime in seconds\n");
+	printf("\t-R Exit all threads on failure to meet rate goal\n");
+	printf("\t-o Use O_DIRECT\n");
+	printf("\t-l Generate per-job latency logs\n");
+	printf("\t-w Generate per-job bandwidth logs\n");
+	printf("\t-f Job file (Required)\n");
+	printf("\t-v Print version info and exit\n");
+}
+
 static void parse_cmd_line(int argc, char *argv[])
 {
 	int c;
 
-	while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwv")) != EOF) {
+	while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwvh")) != EOF) {
 		switch (c) {
 			case 's':
 				def_thread.sequential = !!atoi(optarg);
@@ -912,6 +939,9 @@ static void parse_cmd_line(int argc, char *argv[])
 			case 'w':
 				write_bw_log = 1;
 				break;
+			case 'h':
+				usage(argv[0]);
+				exit(0);
 			case 'v':
 				printf("%s\n", fio_version_string);
 				exit(0);
@@ -974,6 +1004,7 @@ int parse_options(int argc, char *argv[])
 
 	if (!ini_file) {
 		printf("Need job file\n");
+		usage(argv[0]);
 		return 1;
 	}