X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=de9cb4983a57d151ce444c03823b0beab7cfc6f3;hp=1fc694d373a7ce60d5e74431ecc282cfb7e93b69;hb=972cfd2546081c0397447ca9243ea419b1ff579a;hpb=e9c047a0d8dfc32634b896e1600c6f1aa4174378

diff --git a/init.c b/init.c
index 1fc694d3..de9cb498 100644
--- a/init.c
+++ b/init.c
@@ -40,10 +40,15 @@
 #define DEF_RWMIX_READ		(50)
 #define DEF_NICE		(0)
 
+static int def_sequential = DEF_SEQUENTIAL;
+static int def_bs = DEF_BS;
+static int def_timeout = DEF_TIMEOUT;
+static int def_repeatable = DEF_RAND_REPEAT;
+static int def_odirect = DEF_ODIRECT;
+
 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;
@@ -54,6 +59,8 @@ int write_lat_log = 0;
 int write_bw_log = 0;
 int exitall_on_terminate = 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)
 {
@@ -65,51 +72,11 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 		return NULL;
 
 	td = &threads[thread_number++];
-	if (parent)
-		*td = *parent;
-	else
-		memset(td, 0, sizeof(*td));
+	*td = *parent;
+	td->name[0] = '\0';
 
 	td->fd = -1;
 	td->thread_number = thread_number;
-
-	td->ddir = parent->ddir;
-	td->ioprio = parent->ioprio;
-	td->sequential = parent->sequential;
-	td->bs = parent->bs;
-	td->min_bs = parent->min_bs;
-	td->max_bs = parent->max_bs;
-	td->odirect = parent->odirect;
-	td->thinktime = parent->thinktime;
-	td->fsync_blocks = parent->fsync_blocks;
-	td->start_delay = parent->start_delay;
-	td->timeout = parent->timeout;
-	td->io_engine = parent->io_engine;
-	td->create_file = parent->create_file;
-	td->overwrite = parent->overwrite;
-	td->invalidate_cache = parent->invalidate_cache;
-	td->file_size = parent->file_size;
-	td->file_offset = parent->file_offset;
-	td->zone_size = parent->zone_size;
-	td->zone_skip = parent->zone_skip;
-	td->rate = parent->rate;
-	td->ratemin = parent->ratemin;
-	td->ratecycle = parent->ratecycle;
-	td->iodepth = parent->iodepth;
-	td->sync_io = parent->sync_io;
-	td->mem_type = parent->mem_type;
-	td->bw_avg_time = parent->bw_avg_time;
-	td->create_serialize = parent->create_serialize;
-	td->create_fsync = parent->create_fsync;
-	td->loops = parent->loops;
-	td->verify = parent->verify;
-	td->stonewall = parent->stonewall;
-	td->numjobs = parent->numjobs;
-	td->use_thread = parent->use_thread;
-	td->do_disk_util = parent->do_disk_util;
-	memcpy(&td->cpumask, &parent->cpumask, sizeof(td->cpumask));
-	strcpy(td->io_engine_name, parent->io_engine_name);
-
 	return td;
 }
 
@@ -128,13 +95,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
@@ -211,9 +178,9 @@ 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);
+		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)
-		printf("...\n");
+		fprintf(f_out, "...\n");
 
 	/*
 	 * recurse add identical jobs, clear numjobs and stonewall options
@@ -266,7 +233,7 @@ int init_random_state(struct thread_data *td)
 	if (td->sequential)
 		return 0;
 
-	if (repeatable)
+	if (def_repeatable)
 		seeds[3] = DEF_RANDSEED;
 
 	blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
@@ -532,7 +499,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;
 }
 
@@ -549,7 +516,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;
 }
 
@@ -566,7 +533,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;
 }
 
@@ -599,7 +566,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;
 }
 
@@ -616,7 +583,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) {
@@ -646,6 +613,14 @@ int parse_jobs_ini(char *file)
 			break;
 		}
 
+		/*
+		 * Seperate multiple job files by a stonewall
+		 */
+		if (stonewall) {
+			td->stonewall = stonewall;
+			stonewall = 0;
+		}
+
 		fgetpos(f, &off);
 		while ((p = fgets(string, 4096, f)) != NULL) {
 			if (is_empty_or_comment(p))
@@ -657,7 +632,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
@@ -667,7 +642,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
@@ -699,7 +674,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
@@ -871,16 +846,22 @@ int parse_jobs_ini(char *file)
 				continue;
 			}
 			if (!check_strstore(p, "iolog", tmpbuf)) {
+				if (td->write_iolog) {
+					log_err("fio: read iolog overrides given write_iolog\n");
+					free(td->iolog_file);
+					td->write_iolog = 0;
+				}
 				td->iolog_file = strdup(tmpbuf);
 				td->read_iolog = 1;
-				td->write_iolog = 0;
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!td->read_iolog &&
-			    !check_strstore(p, "write_iolog", tmpbuf)) {
-				td->iolog_file = strdup(tmpbuf);
-				td->write_iolog = 1;
+			if (!check_strstore(p, "write_iolog", tmpbuf)) {
+				if (!td->read_iolog) {
+					td->iolog_file = strdup(tmpbuf);
+					td->write_iolog = 1;
+				} else
+					log_err("fio: read iolog overrides given write_iolog\n");
 				fgetpos(f, &off);
 				continue;
 			}
@@ -896,7 +877,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
@@ -944,15 +925,15 @@ static int fill_def_thread(void)
 	 */
 	def_thread.ddir = DDIR_READ;
 	def_thread.iomix = 0;
-	def_thread.bs = DEF_BS;
+	def_thread.bs = def_bs;
 	def_thread.min_bs = -1;
 	def_thread.max_bs = -1;
 	def_thread.io_engine = DEF_IO_ENGINE;
 	strcpy(def_thread.io_engine_name, DEF_IO_ENGINE_NAME);
-	def_thread.odirect = DEF_ODIRECT;
+	def_thread.odirect = def_odirect;
 	def_thread.ratecycle = DEF_RATE_CYCLE;
-	def_thread.sequential = DEF_SEQUENTIAL;
-	def_thread.timeout = DEF_TIMEOUT;
+	def_thread.sequential = def_sequential;
+	def_thread.timeout = def_timeout;
 	def_thread.create_file = DEF_CREATE;
 	def_thread.overwrite = DEF_OVERWRITE;
 	def_thread.invalidate_cache = DEF_INVALIDATE;
@@ -990,43 +971,63 @@ static void usage(char *name)
 	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, "s:b:t:r:R:o:f:lwvhO:")) != EOF) {
 		switch (c) {
 			case 's':
-				def_thread.sequential = !!atoi(optarg);
+				def_sequential = !!atoi(optarg);
+				idx++;
 				break;
 			case 'b':
-				def_thread.bs = atoi(optarg);
-				def_thread.bs <<= 10;
-				if (!def_thread.bs) {
+				def_bs = atoi(optarg);
+				def_bs <<= 10;
+				if (!def_bs) {
 					printf("bad block size\n");
-					def_thread.bs = DEF_BS;
+					def_bs = DEF_BS;
 				}
+				idx++;
 				break;
 			case 't':
-				def_thread.timeout = atoi(optarg);
+				def_timeout = atoi(optarg);
+				idx++;
 				break;
 			case 'r':
-				repeatable = !!atoi(optarg);
+				def_repeatable = !!atoi(optarg);
+				idx++;
 				break;
 			case 'R':
 				rate_quit = !!atoi(optarg);
+				idx++;
 				break;
 			case 'o':
-				def_thread.odirect = !!atoi(optarg);
+				def_odirect = !!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 'h':
 				usage(argv[0]);
@@ -1037,8 +1038,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)
@@ -1046,7 +1058,7 @@ static void free_shm(void)
 	struct shmid_ds sbuf;
 
 	if (threads) {
-		shmdt(threads);
+		shmdt((void *) threads);
 		threads = NULL;
 		shmctl(shm_id, IPC_RMID, &sbuf);
 	}
@@ -1087,21 +1099,26 @@ 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;
+	}
 
 	return 0;
 }