X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio-ini.c;h=540902fee58d1e3ad51e165c18a983fd314f26fe;hp=611bdca884fd805ef175c6801491dd2874d14954;hb=4ae3f76333bf2382e516db0b5c202b8982b1170f;hpb=e8e387c14948e0a038660e69ace4efa13cdfd3af

diff --git a/fio-ini.c b/fio-ini.c
index 611bdca8..540902fe 100644
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -81,11 +81,11 @@ static void setup_log(struct io_log **log)
 
 void finish_log(struct thread_data *td, struct io_log *log, const char *name)
 {
-	char file_name[128];
+	char file_name[256];
 	FILE *f;
 	unsigned int i;
 
-	sprintf(file_name, "client%d_%s.log", td->thread_number, name);
+	snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
 	f = fopen(file_name, "w");
 	if (!f) {
 		perror("fopen log");
@@ -110,7 +110,10 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 		return NULL;
 
 	td = &threads[thread_number++];
-	memset(td, 0, sizeof(*td));
+	if (parent)
+		*td = *parent;
+	else
+		memset(td, 0, sizeof(*td));
 
 	td->fd = -1;
 	td->thread_number = thread_number;
@@ -161,10 +164,10 @@ static void put_job(struct thread_data *td)
 	thread_number--;
 }
 
-static int add_job(struct thread_data *td, const char *jobname, int prioclass,
-		   int prio)
+static int add_job(struct thread_data *td, const char *jobname)
 {
-	char *ddir_str[] = { "read", "write", "randread", "randwrite" };
+	char *ddir_str[] = { "read", "write", "randread", "randwrite",
+			     "rw", NULL, "randrw" };
 	struct stat sb;
 	int numjobs, ddir;
 
@@ -180,9 +183,6 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass,
 		return 1;
 	}
 #endif
-#ifdef FIO_HAVE_IOPRIO
-	td->ioprio = (prioclass << IOPRIO_CLASS_SHIFT) | prio;
-#endif
 
 	/*
 	 * the def_thread is just for options, it's not a real job
@@ -213,11 +213,11 @@ 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);
+		strncpy(td->file_name, jobname, sizeof(td->file_name) - 1);
 
 	sem_init(&td->mutex, 0, 0);
 
@@ -229,7 +229,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,8 +247,8 @@ 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);
-	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);
+	ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
+	printf("Client%d (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
 
 	/*
 	 * recurse add identical jobs, clear numjobs and stonewall options
@@ -263,8 +263,9 @@ 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))
+		if (add_job(td_new, jobname))
 			goto err;
 	}
 	return 0;
@@ -377,16 +378,18 @@ static void strip_blank_front(char **p)
 {
 	char *s = *p;
 
-	while (isblank(*s))
+	while (isspace(*s))
 		s++;
 }
 
 static void strip_blank_end(char *p)
 {
-	while (isblank(*p)) {
-		*p = '\0';
-		p--;
-	}
+	char *s = p + strlen(p) - 1;
+
+	while (isspace(*s) || iscntrl(*s))
+		s--;
+
+	*(s + 1) = '\0';
 }
 
 typedef int (str_cb_fn)(struct thread_data *, char *);
@@ -422,9 +425,6 @@ static int check_strstore(char *p, char *name, char *dest)
 	strip_blank_front(&s);
 
 	strcpy(dest, s);
-
-	s = dest + strlen(dest) - 1;
-	strip_blank_end(s);
 	return 0;
 }
 
@@ -539,6 +539,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);
@@ -602,12 +612,22 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
 		strcpy(td->io_engine_name, "sgio");
 		td->io_engine = FIO_SGIO;
 		return 0;
+	} else if (!strncmp(str, "splice", 6)) {
+		strcpy(td->io_engine_name, "splice");
+		td->io_engine = FIO_SPLICEIO;
+		return 0;
 	}
 
 	fprintf(stderr, "bad ioengine type: %s\n", str);
 	return 1;
 }
 
+static int str_iolog_cb(struct thread_data *td, char *file)
+{
+	strncpy(td->iolog_file, file, sizeof(td->iolog_file) - 1);
+
+	return 0;
+}
 
 int parse_jobs_ini(char *file)
 {
@@ -622,7 +642,7 @@ int parse_jobs_ini(char *file)
 
 	f = fopen(file, "r");
 	if (!f) {
-		perror("fopen");
+		perror("fopen job file");
 		return 1;
 	}
 
@@ -643,20 +663,20 @@ int parse_jobs_ini(char *file)
 		if (!td)
 			return 1;
 
-		prioclass = 2;
-		prio = 4;
-
 		fgetpos(f, &off);
 		while ((p = fgets(string, 4096, f)) != NULL) {
 			if (is_empty_or_comment(p))
 				continue;
 			if (strstr(p, "["))
 				break;
+			strip_blank_end(p);
+
 			if (!check_int(p, "prio", &prio)) {
 #ifndef FIO_HAVE_IOPRIO
 				fprintf(stderr, "io priorities not available\n");
 				return 1;
 #endif
+				td->ioprio |= prio;
 				fgetpos(f, &off);
 				continue;
 			}
@@ -665,6 +685,7 @@ int parse_jobs_ini(char *file)
 				fprintf(stderr, "io priorities not available\n");
 				return 1;
 #endif
+				td->ioprio |= prioclass << IOPRIO_CLASS_SHIFT;
 				fgetpos(f, &off);
 				continue;
 			}
@@ -699,6 +720,7 @@ int parse_jobs_ini(char *file)
 			}
 			if (!check_int(p, "fsync", &td->fsync_blocks)) {
 				fgetpos(f, &off);
+				td->end_fsync = 1;
 				continue;
 			}
 			if (!check_int(p, "startdelay", &td->start_delay)) {
@@ -733,6 +755,10 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_int(p, "end_fsync", &td->end_fsync)) {
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_int(p, "loops", &td->loops)) {
 				fgetpos(f, &off);
 				continue;
@@ -817,12 +843,18 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_str(p, "iolog", str_iolog_cb, td)) {
+				td->iolog = 1;
+				fgetpos(f, &off);
+				continue;
+			}
 
 			printf("Client%d: bad option %s\n",td->thread_number,p);
+			return 1;
 		}
 		fsetpos(f, &off);
 
-		if (add_job(td, name, prioclass, prio))
+		if (add_job(td, name))
 			return 1;
 	}
 
@@ -845,6 +877,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 +907,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,11 +959,17 @@ 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);
 		}
 	}
+
+	if (!ini_file && argc > 1 && argv[argc - 1][0] != '-')
+		ini_file = strdup(argv[argc - 1]);
 }
 
 static void free_shm(void)
@@ -974,11 +1027,14 @@ int parse_options(int argc, char *argv[])
 
 	if (!ini_file) {
 		printf("Need job file\n");
+		usage(argv[0]);
 		return 1;
 	}
 
-	if (parse_jobs_ini(ini_file))
+	if (parse_jobs_ini(ini_file)) {
+		usage(argv[0]);
 		return 1;
+	}
 
 	return 0;
 }