X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=40fcf1c35f61a5426648ee19dcfa9f680147bcf1;hp=3117d60e5d68e530fde45fed328b7b6bb4e39108;hb=c6ae0a5b8123ea9af2ce70319081fbd5d65c8093;hpb=2c0ecd28459b6a1b236c865defb5ef76ce8bfa02

diff --git a/init.c b/init.c
index 3117d60e..40fcf1c3 100644
--- a/init.c
+++ b/init.c
@@ -40,10 +40,11 @@
 #define DEF_RWMIX_READ		(50)
 #define DEF_NICE		(0)
 
+static int def_timeout = DEF_TIMEOUT;
+
 static char fio_version_string[] = "fio 1.4";
 
-static int repeatable = DEF_RAND_REPEAT;
-static char *ini_file;
+static char **ini_file;
 static int max_jobs = MAX_JOBS;
 
 struct thread_data def_thread;
@@ -53,7 +54,10 @@ int rate_quit = 0;
 int write_lat_log = 0;
 int write_bw_log = 0;
 int exitall_on_terminate = 0;
+int terse_output = 0;
 unsigned long long mlock_size = 0;
+FILE *f_out = NULL;
+FILE *f_err = NULL;
 
 static struct thread_data *get_new_job(int global, struct thread_data *parent)
 {
@@ -70,7 +74,6 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 
 	td->fd = -1;
 	td->thread_number = thread_number;
-
 	return td;
 }
 
@@ -89,13 +92,13 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 #ifndef FIO_HAVE_LIBAIO
 	if (td->io_engine == FIO_LIBAIO) {
-		fprintf(stderr, "Linux libaio not available\n");
+		log_err("Linux libaio not available\n");
 		return 1;
 	}
 #endif
 #ifndef FIO_HAVE_POSIXAIO
 	if (td->io_engine == FIO_POSIXAIO) {
-		fprintf(stderr, "posix aio not available\n");
+		log_err("posix aio not available\n");
 		return 1;
 	}
 #endif
@@ -131,9 +134,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		char tmp[PATH_MAX];
 
 		if (td->directory && td->directory[0] != '\0')
-			sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->jobnum);
+			sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->thread_number);
 		else
-			sprintf(tmp, "%s.%d", jobname, td->jobnum);
+			sprintf(tmp, "%s.%d", jobname, td->thread_number);
 		td->file_name = strdup(tmp);
 	} else
 		td->file_name = strdup(jobname);
@@ -171,10 +174,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 	ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
 
-	if (!job_add_num)
-		printf("%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
-	else if (job_add_num == 1)
-		printf("...\n");
+	if (!terse_output) {
+		if (!job_add_num)
+			fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+		else if (job_add_num == 1)
+			fprintf(f_out, "...\n");
+	}
 
 	/*
 	 * recurse add identical jobs, clear numjobs and stonewall options
@@ -189,7 +194,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 		td_new->numjobs = 1;
 		td_new->stonewall = 0;
-		td_new->jobnum = numjobs;
 		job_add_num = numjobs - 1;
 
 		if (add_job(td_new, jobname, job_add_num))
@@ -227,7 +231,7 @@ int init_random_state(struct thread_data *td)
 	if (td->sequential)
 		return 0;
 
-	if (repeatable)
+	if (td->rand_repeatable)
 		seeds[3] = DEF_RANDSEED;
 
 	blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
@@ -493,7 +497,7 @@ static int str_rw_cb(struct thread_data *td, char *mem)
 		return 0;
 	}
 
-	fprintf(stderr, "fio: data direction: read, write, randread, randwrite, rw, randrw\n");
+	log_err("fio: data direction: read, write, randread, randwrite, rw, randrw\n");
 	return 1;
 }
 
@@ -510,7 +514,7 @@ static int str_verify_cb(struct thread_data *td, char *mem)
 		return 0;
 	}
 
-	fprintf(stderr, "fio: verify types: md5, crc32\n");
+	log_err("fio: verify types: md5, crc32\n");
 	return 1;
 }
 
@@ -527,7 +531,7 @@ static int str_mem_cb(struct thread_data *td, char *mem)
 		return 0;
 	}
 
-	fprintf(stderr, "fio: mem type: malloc, shm, mmap\n");
+	log_err("fio: mem type: malloc, shm, mmap\n");
 	return 1;
 }
 
@@ -560,7 +564,7 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
 		return 0;
 	}
 
-	fprintf(stderr, "fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice\n");
+	log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice\n");
 	return 1;
 }
 
@@ -577,7 +581,7 @@ int parse_jobs_ini(char *file)
 	fpos_t off;
 	FILE *f;
 	char *p;
-	int ret = 0;
+	int ret = 0, stonewall = 1;
 
 	f = fopen(file, "r");
 	if (!f) {
@@ -607,6 +611,14 @@ int parse_jobs_ini(char *file)
 			break;
 		}
 
+		/*
+		 * Seperate multiple job files by a stonewall
+		 */
+		if (!global && stonewall) {
+			td->stonewall = stonewall;
+			stonewall = 0;
+		}
+
 		fgetpos(f, &off);
 		while ((p = fgets(string, 4096, f)) != NULL) {
 			if (is_empty_or_comment(p))
@@ -618,7 +630,7 @@ int parse_jobs_ini(char *file)
 
 			if (!check_int(p, "prio", &prio)) {
 #ifndef FIO_HAVE_IOPRIO
-				fprintf(stderr, "io priorities not available\n");
+				log_err("io priorities not available\n");
 				ret = 1;
 				break;
 #endif
@@ -628,7 +640,7 @@ int parse_jobs_ini(char *file)
 			}
 			if (!check_int(p, "prioclass", &prioclass)) {
 #ifndef FIO_HAVE_IOPRIO
-				fprintf(stderr, "io priorities not available\n");
+				log_err("io priorities not available\n");
 				ret = 1;
 				break;
 #else
@@ -642,6 +654,11 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_int(p, "rand_repeatable", &il)) {
+				td->rand_repeatable = il;
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_int(p, "rate", &td->rate)) {
 				fgetpos(f, &off);
 				continue;
@@ -660,7 +677,7 @@ int parse_jobs_ini(char *file)
 			}
 			if (!check_int(p, "cpumask", &cpu)) {
 #ifndef FIO_HAVE_CPU_AFFINITY
-				fprintf(stderr, "cpu affinity not available\n");
+				log_err("cpu affinity not available\n");
 				ret = 1;
 				break;
 #endif
@@ -833,7 +850,7 @@ int parse_jobs_ini(char *file)
 			}
 			if (!check_strstore(p, "iolog", tmpbuf)) {
 				if (td->write_iolog) {
-					fprintf(stderr, "fio: read iolog overrides given write_iolog\n");
+					log_err("fio: read iolog overrides given write_iolog\n");
 					free(td->iolog_file);
 					td->write_iolog = 0;
 				}
@@ -847,7 +864,7 @@ int parse_jobs_ini(char *file)
 					td->iolog_file = strdup(tmpbuf);
 					td->write_iolog = 1;
 				} else
-					fprintf(stderr, "fio: read iolog overrides given write_iolog\n");
+					log_err("fio: read iolog overrides given write_iolog\n");
 				fgetpos(f, &off);
 				continue;
 			}
@@ -863,7 +880,7 @@ int parse_jobs_ini(char *file)
 			}
 			if (!check_strstore(p, "ioscheduler", tmpbuf)) {
 #ifndef FIO_HAVE_IOSCHED_SWITCH
-				fprintf(stderr, "io scheduler switching not available\n");
+				log_err("io scheduler switching not available\n");
 				ret = 1;
 				break;
 #else
@@ -919,7 +936,7 @@ static int fill_def_thread(void)
 	def_thread.odirect = DEF_ODIRECT;
 	def_thread.ratecycle = DEF_RATE_CYCLE;
 	def_thread.sequential = DEF_SEQUENTIAL;
-	def_thread.timeout = DEF_TIMEOUT;
+	def_thread.timeout = def_timeout;
 	def_thread.create_file = DEF_CREATE;
 	def_thread.overwrite = DEF_OVERWRITE;
 	def_thread.invalidate_cache = DEF_INVALIDATE;
@@ -936,6 +953,7 @@ static int fill_def_thread(void)
 	def_thread.rwmixcycle = DEF_RWMIX_CYCLE;
 	def_thread.rwmixread = DEF_RWMIX_READ;
 	def_thread.nice = DEF_NICE;
+	def_thread.rand_repeatable = DEF_RAND_REPEAT;
 #ifdef FIO_HAVE_DISK_UTIL
 	def_thread.do_disk_util = 1;
 #endif
@@ -946,54 +964,51 @@ static int fill_def_thread(void)
 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-o Write output to file\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-m Minimal (terse) output\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[])
+static int parse_cmd_line(int argc, char *argv[])
 {
-	int c;
+	int c, idx = 1, ini_idx = 0;
 
-	while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwvh")) != EOF) {
+	while ((c = getopt(argc, argv, "t:o:f:lwvhm")) != EOF) {
 		switch (c) {
-			case 's':
-				def_thread.sequential = !!atoi(optarg);
-				break;
-			case 'b':
-				def_thread.bs = atoi(optarg);
-				def_thread.bs <<= 10;
-				if (!def_thread.bs) {
-					printf("bad block size\n");
-					def_thread.bs = DEF_BS;
-				}
-				break;
 			case 't':
-				def_thread.timeout = atoi(optarg);
-				break;
-			case 'r':
-				repeatable = !!atoi(optarg);
-				break;
-			case 'R':
-				rate_quit = !!atoi(optarg);
-				break;
-			case 'o':
-				def_thread.odirect = !!atoi(optarg);
+				def_timeout = atoi(optarg);
+				idx++;
 				break;
 			case 'f':
-				ini_file = strdup(optarg);
+				ini_idx++;
+				ini_file = realloc(ini_file, ini_idx * sizeof(char *));
+				ini_file[ini_idx - 1] = strdup(optarg);
+				idx++;
 				break;
 			case 'l':
 				write_lat_log = 1;
+				idx++;
 				break;
 			case 'w':
 				write_bw_log = 1;
+				idx++;
+				break;
+			case 'o':
+				f_out = fopen(optarg, "w+");
+				if (!f_out) {
+					perror("fopen output");
+					exit(1);
+				}
+				f_err = f_out;
+				idx++;
+				break;
+			case 'm':
+				terse_output = 1;
+				idx++;
 				break;
 			case 'h':
 				usage(argv[0]);
@@ -1004,8 +1019,19 @@ static void parse_cmd_line(int argc, char *argv[])
 		}
 	}
 
-	if (!ini_file && argc > 1 && argv[argc - 1][0] != '-')
-		ini_file = strdup(argv[argc - 1]);
+	while (idx < argc) {
+		ini_idx++;
+		ini_file = realloc(ini_file, ini_idx * sizeof(char *));
+		ini_file[ini_idx - 1] = strdup(argv[idx]);
+		idx++;
+	}
+		
+	if (!f_out) {
+		f_out = stdout;
+		f_err = stderr;
+	}
+
+	return ini_idx;
 }
 
 static void free_shm(void)
@@ -1054,21 +1080,28 @@ static int setup_thread_area(void)
 
 int parse_options(int argc, char *argv[])
 {
+	int job_files, i;
+
 	if (setup_thread_area())
 		return 1;
 	if (fill_def_thread())
 		return 1;
 
-	parse_cmd_line(argc, argv);
-
-	if (!ini_file) {
-		printf("Need job file\n");
+	job_files = parse_cmd_line(argc, argv);
+	if (!job_files) {
+		log_err("Need job file(s)\n");
 		usage(argv[0]);
 		return 1;
 	}
 
-	if (parse_jobs_ini(ini_file))
-		return 1;
+	for (i = 0; i < job_files; i++) {
+		if (fill_def_thread())
+			return 1;
+		if (parse_jobs_ini(ini_file[i]))
+			return 1;
+		free(ini_file[i]);
+	}
 
+	free(ini_file);
 	return 0;
 }