X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=53e126b48dc8e97f52eab64019975c628f2a803e;hp=e38d67786a1a80284c1886a90b3e083a19afc5e1;hb=f657a2fbbb0deaf455edc478d73b664929bcb766;hpb=2dc1bbeb58edc85f2829eed6729862c438ea2353

diff --git a/init.c b/init.c
index e38d6778..53e126b4 100644
--- a/init.c
+++ b/init.c
@@ -17,12 +17,13 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.14a";
+static char fio_version_string[] = "fio 1.16.5";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
+static int dump_cmdline;
 
 struct thread_data def_thread;
 struct thread_data *threads = NULL;
@@ -85,6 +86,11 @@ static struct option long_options[FIO_NR_OPTIONS] = {
 		.has_arg	= optional_argument,
 		.val		= 'c',
 	},
+	{
+		.name		= "showcmd",
+		.has_arg	= no_argument,
+		.val		= 's'
+	},
 	{
 		.name		= NULL,
 	},
@@ -115,6 +121,9 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 	td = &threads[thread_number++];
 	*td = *parent;
 
+	dup_files(td, parent);
+	options_mem_dupe(td);
+
 	td->thread_number = thread_number;
 	return td;
 }
@@ -171,8 +180,8 @@ static int fixup_options(struct thread_data *td)
 {
 	struct thread_options *o = &td->o;
 
-	if (!o->rwmixread && o->rwmixwrite)
-		o->rwmixread = 100 - o->rwmixwrite;
+	if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
+		o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
 
 	if (o->write_iolog_file && o->read_iolog_file) {
 		log_err("fio: read iolog overrides write_iolog\n");
@@ -265,6 +274,11 @@ static int fixup_options(struct thread_data *td)
 		return 1;
 	}
 
+	if (!o->timeout && o->time_based) {
+		log_err("fio: time_based requires a runtime/timeout setting\n");
+		o->time_based = 0;
+	}
+
 	return 0;
 }
 
@@ -323,9 +337,7 @@ static int exists_and_not_file(const char *filename)
 static int init_random_state(struct thread_data *td)
 {
 	unsigned long seeds[6];
-	int fd, num_maps, blocks;
-	struct fio_file *f;
-	unsigned int i;
+	int fd;
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
@@ -356,25 +368,10 @@ static int init_random_state(struct thread_data *td)
 	if (td->o.rand_repeatable)
 		seeds[4] = FIO_RANDSEED * td->thread_number;
 
-	if (!td->o.norandommap) {
-		for_each_file(td, f, i) {
-			blocks = (f->real_file_size + td->o.rw_min_bs - 1) / td->o.rw_min_bs;
-			num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
-			f->file_map = malloc(num_maps * sizeof(long));
-			if (!f->file_map) {
-				log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
-				return 1;
-			}
-			f->num_maps = num_maps;
-			memset(f->file_map, 0, num_maps * sizeof(long));
-		}
-	}
-
 	os_random_seed(seeds[4], &td->random_state);
 	return 0;
 }
 
-
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
@@ -385,7 +382,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
 				   "randread", "randwrite", "randrw" };
 	unsigned int i;
-	struct fio_file *f;
 	const char *engine;
 	char fname[PATH_MAX];
 	int numjobs, file_alloced;
@@ -396,6 +392,14 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td == &def_thread)
 		return 0;
 
+	/*
+	 * if we are just dumping the output command line, don't add the job
+	 */
+	if (dump_cmdline) {
+		put_job(td);
+		return 0;
+	}
+
 	engine = get_engine_name(td->o.ioengine);
 	td->io_ops = load_ioengine(td, engine);
 	if (!td->io_ops) {
@@ -428,20 +432,22 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (fixup_options(td))
 		goto err;
 
-	for_each_file(td, f, i) {
-		if (td->o.directory && f->filetype == FIO_TYPE_FILE) {
-			sprintf(fname, "%s/%s", td->o.directory, f->file_name);
-			f->file_name = strdup(fname);
-		}
+	if (td->io_ops->flags & FIO_DISKLESSIO) {
+		struct fio_file *f;
+
+		for_each_file(td, f, i)
+			f->real_file_size = -1ULL;
 	}
-		
+
 	td->mutex = fio_sem_init(0);
 
 	td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
 	td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
 	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) && prev_group_jobs) {
+	if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group)
+	     && prev_group_jobs) {
 		prev_group_jobs = 0;
 		groupid++;
 	}
@@ -501,6 +507,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 		td_new->o.numjobs = 1;
 		td_new->o.stonewall = 0;
+		td_new->o.new_group = 0;
 
 		if (file_alloced) {
 			td_new->o.filename = NULL;
@@ -514,11 +521,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			goto err;
 	}
 
-	if (td->o.numjobs > 1) {
-		groupid++;
-		prev_group_jobs = 0;
-	}
-
 	return 0;
 err:
 	put_job(td);
@@ -553,6 +555,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 	FILE *f;
 	char *p;
 	int ret = 0, stonewall;
+	int first_sect = 1;
 
 	f = fopen(file, "r");
 	if (!f) {
@@ -569,15 +572,29 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 		p = fgets(string, 4095, f);
 		if (!p)
 			break;
+
+		strip_blank_front(&p);
+		strip_blank_end(p);
+
 		if (is_empty_or_comment(p))
 			continue;
-		if (sscanf(p, "[%255s]", name) != 1)
+		if (sscanf(p, "[%255s]", name) != 1) {
+			log_err("fio: option <%s> outside of job section\n", p);
 			continue;
+		}
 
 		global = !strncmp(name, "global", 6);
 
 		name[strlen(name) - 1] = '\0';
 
+		if (dump_cmdline) {
+			if (first_sect)
+				log_info("fio ");
+			if (!global)
+				log_info("--name=%s ", name);
+			first_sect = 0;
+		}
+
 		td = get_new_job(global, &def_thread);
 		if (!td) {
 			ret = 1;
@@ -612,6 +629,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 			 * easier on the user.
 			 */
 			ret |= fio_option_parse(td, p);
+			if (!ret && dump_cmdline)
+				log_info("--%s ", p);
 		}
 
 		if (!ret) {
@@ -623,6 +642,9 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 		}
 	} while (!ret);
 
+	if (dump_cmdline)
+		log_info("\n");
+
 	free(string);
 	free(name);
 	fclose(f);
@@ -633,10 +655,7 @@ static int fill_def_thread(void)
 {
 	memset(&def_thread, 0, sizeof(def_thread));
 
-	if (fio_getaffinity(getpid(), &def_thread.o.cpumask) == -1) {
-		perror("sched_getaffinity");
-		return 1;
-	}
+	fio_getaffinity(getpid(), &def_thread.o.cpumask);
 
 	/*
 	 * fill default options
@@ -647,10 +666,6 @@ static int fill_def_thread(void)
 	def_thread.o.write_bw_log = write_bw_log;
 	def_thread.o.write_lat_log = write_lat_log;
 
-#ifdef FIO_HAVE_DISK_UTIL
-	def_thread.o.do_disk_util = 1;
-#endif
-
 	return 0;
 }
 
@@ -714,6 +729,7 @@ static void usage(void)
 	printf("\t--version\tPrint version info and exit\n");
 	printf("\t--help\t\tPrint this page\n");
 	printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n");
+	printf("\t--showcmd\tTurn a job file into command line options\n");
 }
 
 static int parse_cmd_line(int argc, char *argv[])
@@ -748,6 +764,9 @@ static int parse_cmd_line(int argc, char *argv[])
 			exit(0);
 		case 'c':
 			exit(fio_show_option_help(optarg));
+		case 's':
+			dump_cmdline = 1;
+			break;
 		case 'v':
 			printf("%s\n", fio_version_string);
 			exit(0);
@@ -764,7 +783,11 @@ static int parse_cmd_line(int argc, char *argv[])
 				td = NULL;
 			}
 			if (!td) {
-				int global = !strncmp(val, "global", 6);
+				int global = 0;
+
+				if (strncmp(opt, "name", 4) ||
+				    !strncmp(val, "global", 6))
+					global = 1;
 
 				td = get_new_job(global, &def_thread);
 				if (!td)
@@ -827,8 +850,12 @@ int parse_options(int argc, char *argv[])
 	}
 
 	free(ini_file);
+	options_mem_free(&def_thread);
 
 	if (!thread_number) {
+		if (dump_cmdline)
+			return 0;
+
 		log_err("No jobs defined(s)\n");
 		return 1;
 	}