X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=1a0f7385dfcbe5fe994ba8757f8e22b254b92ed4;hp=4d7202ec98008d81af6688082762af07f3d113fd;hb=01f06b63ba67d3bc7fa11766d9f13d229c4cec5c;hpb=d9cc7c135a927811117930ac74aa83189d3c9d19

diff --git a/init.c b/init.c
index 4d7202ec..1a0f7385 100644
--- a/init.c
+++ b/init.c
@@ -17,7 +17,7 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.16.8";
+static char fio_version_string[] = "fio 1.18.1";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -30,17 +30,22 @@ struct thread_data *threads = NULL;
 
 int exitall_on_terminate = 0;
 int terse_output = 0;
+int eta_print;
 unsigned long long mlock_size = 0;
 FILE *f_out = NULL;
 FILE *f_err = NULL;
+char *job_section = NULL;
 
 int write_bw_log = 0;
+int read_only = 0;
 
 static int def_timeout = 0;
 static int write_lat_log = 0;
 
 static int prev_group_jobs;
 
+unsigned long fio_debug = 0;
+
 /*
  * Command line options. These will contain the above, plus a few
  * extra that only pertain to fio itself and not jobs.
@@ -89,7 +94,27 @@ static struct option long_options[FIO_NR_OPTIONS] = {
 	{
 		.name		= "showcmd",
 		.has_arg	= no_argument,
-		.val		= 's'
+		.val		= 's',
+	},
+	{
+		.name		= "readonly",
+		.has_arg	= no_argument,
+		.val		= 'r',
+	},
+	{
+		.name		= "eta",
+		.has_arg	= required_argument,
+		.val		= 'e',
+	},
+	{
+		.name		= "debug",
+		.has_arg	= required_argument,
+		.val		= 'd',
+	},
+	{
+		.name		= "section",
+		.has_arg	= required_argument,
+		.val		= 'x',
 	},
 	{
 		.name		= NULL,
@@ -180,6 +205,11 @@ static int fixup_options(struct thread_data *td)
 {
 	struct thread_options *o = &td->o;
 
+	if (read_only && td_write(td)) {
+		log_err("fio: job <%s> has write bit set, but fio is in read-only mode\n", td->o.name);
+		return 1;
+	}
+	
 	if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
 		o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
 
@@ -189,13 +219,6 @@ static int fixup_options(struct thread_data *td)
 		o->write_iolog_file = NULL;
 	}
 
-	if (td->io_ops->flags & FIO_SYNCIO)
-		o->iodepth = 1;
-	else {
-		if (!o->iodepth)
-			o->iodepth = o->open_files;
-	}
-
 	/*
 	 * only really works for sequential io for now, and with 1 file
 	 */
@@ -222,9 +245,6 @@ static int fixup_options(struct thread_data *td)
 	if (!o->file_size_high)
 		o->file_size_high = o->file_size_low;
 
-	if (td_read(td) && !td_rw(td))
-		o->verify = 0;
-
 	if (o->norandommap && o->verify != VERIFY_NONE) {
 		log_err("fio: norandommap given, verify disabled\n");
 		o->verify = VERIFY_NONE;
@@ -279,6 +299,13 @@ static int fixup_options(struct thread_data *td)
 		o->time_based = 0;
 	}
 
+	if (o->fill_device && !o->size)
+		o->size = ULONG_LONG_MAX;
+	
+	if (td_rw(td) && td->o.verify != VERIFY_NONE)
+		log_info("fio: mixed read/write workload with verify. May not "
+		 "work as expected, unless you pre-populated the file\n");
+
 	return 0;
 }
 
@@ -527,6 +554,16 @@ err:
 	return -1;
 }
 
+static int skip_this_section(const char *name)
+{
+	if (!job_section)
+		return 0;
+	if (!strncmp(name, "global", 6))
+		return 0;
+
+	return strncmp(job_section, name, strlen(job_section));
+}
+
 static int is_empty_or_comment(char *line)
 {
 	unsigned int i;
@@ -551,13 +588,18 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 	unsigned int global;
 	struct thread_data *td;
 	char *string, *name;
-	fpos_t off;
 	FILE *f;
 	char *p;
 	int ret = 0, stonewall;
 	int first_sect = 1;
+	int skip_fgets = 0;
+	int inside_skip = 0;
+
+	if (!strcmp(file, "-"))
+		f = stdin;
+	else
+		f = fopen(file, "r");
 
-	f = fopen(file, "r");
 	if (!f) {
 		perror("fopen job file");
 		return 1;
@@ -573,20 +615,35 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
 	stonewall = stonewall_flag;
 	do {
-		p = fgets(string, 4095, f);
-		if (!p)
-			break;
+		/*
+		 * if skip_fgets is set, we already have loaded a line we
+		 * haven't handled.
+		 */
+		if (!skip_fgets) {
+			p = fgets(string, 4095, f);
+			if (!p)
+				break;
+		}
 
+		skip_fgets = 0;
 		strip_blank_front(&p);
 		strip_blank_end(p);
 
 		if (is_empty_or_comment(p))
 			continue;
 		if (sscanf(p, "[%255s]", name) != 1) {
+			if (inside_skip)
+				continue;
 			log_err("fio: option <%s> outside of [] job section\n", p);
 			break;
 		}
 
+		if (skip_this_section(name)) {
+			inside_skip = 1;
+			continue;
+		} else
+			inside_skip = 0;
+
 		global = !strncmp(name, "global", 6);
 
 		name[strlen(name) - 1] = '\0';
@@ -613,20 +670,23 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 			stonewall = 0;
 		}
 
-		fgetpos(f, &off);
 		while ((p = fgets(string, 4096, f)) != NULL) {
 			if (is_empty_or_comment(p))
 				continue;
 
 			strip_blank_front(&p);
 
-			if (p[0] == '[')
+			/*
+			 * new section, break out and make sure we don't
+			 * fgets() a new line at the top.
+			 */
+			if (p[0] == '[') {
+				skip_fgets = 1;
 				break;
+			}
 
 			strip_blank_end(p);
 
-			fgetpos(f, &off);
-
 			/*
 			 * Don't break here, continue parsing options so we
 			 * dump all the bad ones. Makes trial/error fixups
@@ -637,10 +697,9 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 				log_info("--%s ", p);
 		}
 
-		if (!ret) {
-			fsetpos(f, &off);
+		if (!ret)
 			ret = add_job(td, name, 0);
-		} else {
+		else {
 			log_err("fio: job %s dropped\n", name);
 			put_job(td);
 		}
@@ -651,7 +710,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
 	free(string);
 	free(name);
-	fclose(f);
+	if (f != stdin)
+		fclose(f);
 	return ret;
 }
 
@@ -718,13 +778,16 @@ static int setup_thread_area(void)
 		return 1;
 	}
 
+	memset(threads, 0, max_jobs * sizeof(struct thread_data));
 	atexit(free_shm);
 	return 0;
 }
 
-static void usage(void)
+static void usage(const char *name)
 {
 	printf("%s\n", fio_version_string);
+	printf("%s [options] [job options] <job file(s)>\n", name);
+	printf("\t--debug=options\tEnable debug logging\n");
 	printf("\t--output\tWrite output to file\n");
 	printf("\t--timeout\tRuntime in seconds\n");
 	printf("\t--latency-log\tGenerate per-job latency logs\n");
@@ -734,12 +797,73 @@ static void usage(void)
 	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");
+	printf("\t--eta=when\tWhen ETA estimate should be printed\n");
+	printf("\t          \tMay be \"always\", \"never\" or \"auto\"\n");
+	printf("\t--readonly\tTurn on safety read-only checks, preventing writes\n");
+	printf("\t--section=name\tOnly run specified section in job file\n");
 }
 
+#ifdef FIO_INC_DEBUG
+struct debug_level debug_levels[] = {
+	{ .name = "process",	.shift = FD_PROCESS, },
+	{ .name = "file",	.shift = FD_FILE, },
+	{ .name = "io",		.shift = FD_IO, },
+	{ .name = "mem",	.shift = FD_MEM, },
+	{ .name = "blktrace",	.shift = FD_BLKTRACE },
+	{ .name = "verify",	.shift = FD_VERIFY },
+	{ },
+};
+
+static void set_debug(const char *string)
+{
+	struct debug_level *dl;
+	char *p = (char *) string;
+	char *opt;
+	int i;
+
+	if (!strcmp(string, "?") || !strcmp(string, "help")) {
+		int i;
+
+		log_info("fio: dumping debug options:");
+		for (i = 0; debug_levels[i].name; i++) {
+			dl = &debug_levels[i];
+			log_info("%s,", dl->name);
+		}
+		log_info("all\n");
+		return;
+	} else if (!strcmp(string, "all")) {
+		fio_debug = ~0UL;
+		return;
+	}
+
+	while ((opt = strsep(&p, ",")) != NULL) {
+		int found = 0;
+
+		for (i = 0; debug_levels[i].name; i++) {
+			dl = &debug_levels[i];
+			if (!strncmp(opt, dl->name, strlen(opt))) {
+				log_info("fio: set debug option %s\n", opt);
+				found = 1;
+				fio_debug |= (1UL << dl->shift);
+				break;
+			}
+		}
+
+		if (!found)
+			log_err("fio: debug mask %s not found\n", opt);
+	}
+}
+#else
+static void set_debug(const char *string)
+{
+	log_err("fio: debug tracing not included in build\n");
+}
+#endif
+
 static int parse_cmd_line(int argc, char *argv[])
 {
 	struct thread_data *td = NULL;
-	int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
+	int c, ini_idx = 0, lidx, ret, dont_add_job = 0, bad_options = 0;
 
 	while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
 		switch (c) {
@@ -764,16 +888,38 @@ static int parse_cmd_line(int argc, char *argv[])
 			terse_output = 1;
 			break;
 		case 'h':
-			usage();
+			usage(argv[0]);
 			exit(0);
 		case 'c':
 			exit(fio_show_option_help(optarg));
 		case 's':
 			dump_cmdline = 1;
 			break;
+		case 'r':
+			read_only = 1;
+			break;
 		case 'v':
 			printf("%s\n", fio_version_string);
 			exit(0);
+		case 'e':
+			if (!strcmp("always", optarg))
+				eta_print = FIO_ETA_ALWAYS;
+			else if (!strcmp("never", optarg))
+				eta_print = FIO_ETA_NEVER;
+			break;
+		case 'd':
+			set_debug(optarg);
+			break;
+		case 'x':
+			if (!strcmp(optarg, "global")) {
+				log_err("fio: can't use global as only section\n");
+				bad_options++;
+				break;
+			}
+			if (job_section)
+				free(job_section);
+			job_section = strdup(optarg);
+			break;
 		case FIO_GETOPT_JOB: {
 			const char *opt = long_options[lidx].name;
 			char *val = optarg;
@@ -787,12 +933,15 @@ static int parse_cmd_line(int argc, char *argv[])
 				td = NULL;
 			}
 			if (!td) {
+				int is_section = !strncmp(opt, "name", 4);
 				int global = 0;
 
-				if (strncmp(opt, "name", 4) ||
-				    !strncmp(val, "global", 6))
+				if (!is_section || !strncmp(val, "global", 6))
 					global = 1;
 
+				if (is_section && skip_this_section(val))
+					continue;
+
 				td = get_new_job(global, &def_thread);
 				if (!td)
 					return 0;
@@ -804,10 +953,14 @@ static int parse_cmd_line(int argc, char *argv[])
 			break;
 		}
 		default:
+			bad_options++;
 			break;
 		}
 	}
 
+	if (bad_options)
+		exit(1);
+
 	if (td) {
 		if (dont_add_job)
 			put_job(td);
@@ -828,7 +981,6 @@ static int parse_cmd_line(int argc, char *argv[])
 	return ini_idx;
 }
 
-
 int parse_options(int argc, char *argv[])
 {
 	int job_files, i;
@@ -861,6 +1013,7 @@ int parse_options(int argc, char *argv[])
 			return 0;
 
 		log_err("No jobs defined(s)\n");
+		usage(argv[0]);
 		return 1;
 	}