X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=64023458d03250e87d4064aef02f21292f149028;hp=b70ccaf8b7a68d13bffc0967490963ac775a7bf2;hb=79713149b1d30ad4dab560621c86b24a1dcaf348;hpb=214e1ecae844a32bf8f66d19132f4948d922dcee

diff --git a/init.c b/init.c
index b70ccaf8..64023458 100644
--- a/init.c
+++ b/init.c
@@ -17,29 +17,34 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.14a";
+static char fio_version_string[] = "fio 1.18";
 
 #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;
 
 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;
 
 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.
@@ -85,6 +90,26 @@ static struct option long_options[FIO_NR_OPTIONS] = {
 		.has_arg	= optional_argument,
 		.val		= 'c',
 	},
+	{
+		.name		= "showcmd",
+		.has_arg	= no_argument,
+		.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		= NULL,
 	},
@@ -115,6 +140,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;
 }
@@ -131,96 +159,148 @@ static void put_job(struct thread_data *td)
 	thread_number--;
 }
 
+static int setup_rate(struct thread_data *td)
+{
+	unsigned long nr_reads_per_msec;
+	unsigned long long rate;
+	unsigned int bs;
+
+	if (!td->o.rate && !td->o.rate_iops)
+		return 0;
+
+	if (td_rw(td))
+		bs = td->o.rw_min_bs;
+	else if (td_read(td))
+		bs = td->o.min_bs[DDIR_READ];
+	else
+		bs = td->o.min_bs[DDIR_WRITE];
+
+	if (td->o.rate) {
+		rate = td->o.rate;
+		nr_reads_per_msec = (rate * 1024 * 1000LL) / bs;
+	} else
+		nr_reads_per_msec = td->o.rate_iops * 1000UL;
+
+	if (!nr_reads_per_msec) {
+		log_err("rate lower than supported\n");
+		return -1;
+	}
+
+	td->rate_usec_cycle = 1000000000ULL / nr_reads_per_msec;
+	td->rate_pending_usleep = 0;
+	return 0;
+}
+
 /*
  * Lazy way of fixing up options that depend on each other. We could also
  * define option callback handlers, but this is easier.
  */
-static void fixup_options(struct thread_data *td)
+static int fixup_options(struct thread_data *td)
 {
-	if (!td->rwmixread && td->rwmixwrite)
-		td->rwmixread = 100 - td->rwmixwrite;
+	struct thread_options *o = &td->o;
 
-	if (td->write_iolog_file && td->read_iolog_file) {
-		log_err("fio: read iolog overrides write_iolog\n");
-		free(td->write_iolog_file);
-		td->write_iolog_file = NULL;
+	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];
 
-	if (td->io_ops->flags & FIO_SYNCIO)
-		td->iodepth = 1;
-	else {
-		if (!td->iodepth)
-			td->iodepth = td->open_files;
+	if (o->write_iolog_file && o->read_iolog_file) {
+		log_err("fio: read iolog overrides write_iolog\n");
+		free(o->write_iolog_file);
+		o->write_iolog_file = NULL;
 	}
 
 	/*
 	 * only really works for sequential io for now, and with 1 file
 	 */
-	if (td->zone_size && td_random(td) && td->open_files == 1)
-		td->zone_size = 0;
+	if (o->zone_size && td_random(td) && o->open_files == 1)
+		o->zone_size = 0;
 
 	/*
 	 * Reads can do overwrites, we always need to pre-create the file
 	 */
 	if (td_read(td) || td_rw(td))
-		td->overwrite = 1;
+		o->overwrite = 1;
 
-	if (!td->min_bs[DDIR_READ])
-		td->min_bs[DDIR_READ]= td->bs[DDIR_READ];
-	if (!td->max_bs[DDIR_READ])
-		td->max_bs[DDIR_READ] = td->bs[DDIR_READ];
-	if (!td->min_bs[DDIR_WRITE])
-		td->min_bs[DDIR_WRITE]= td->bs[DDIR_WRITE];
-	if (!td->max_bs[DDIR_WRITE])
-		td->max_bs[DDIR_WRITE] = td->bs[DDIR_WRITE];
+	if (!o->min_bs[DDIR_READ])
+		o->min_bs[DDIR_READ]= o->bs[DDIR_READ];
+	if (!o->max_bs[DDIR_READ])
+		o->max_bs[DDIR_READ] = o->bs[DDIR_READ];
+	if (!o->min_bs[DDIR_WRITE])
+		o->min_bs[DDIR_WRITE]= o->bs[DDIR_WRITE];
+	if (!o->max_bs[DDIR_WRITE])
+		o->max_bs[DDIR_WRITE] = o->bs[DDIR_WRITE];
 
-	td->rw_min_bs = min(td->min_bs[DDIR_READ], td->min_bs[DDIR_WRITE]);
+	o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]);
 
-	if (!td->file_size_high)
-		td->file_size_high = td->file_size_low;
+	if (!o->file_size_high)
+		o->file_size_high = o->file_size_low;
 
-	if (td_read(td) && !td_rw(td))
-		td->verify = 0;
-
-	if (td->norandommap && td->verify != VERIFY_NONE) {
+	if (o->norandommap && o->verify != VERIFY_NONE) {
 		log_err("fio: norandommap given, verify disabled\n");
-		td->verify = VERIFY_NONE;
+		o->verify = VERIFY_NONE;
 	}
-	if (td->bs_unaligned && (td->odirect || td->io_ops->flags & FIO_RAWIO))
+	if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO))
 		log_err("fio: bs_unaligned may not work with raw io\n");
 
 	/*
 	 * thinktime_spin must be less than thinktime
 	 */
-	if (td->thinktime_spin > td->thinktime)
-		td->thinktime_spin = td->thinktime;
+	if (o->thinktime_spin > o->thinktime)
+		o->thinktime_spin = o->thinktime;
 
 	/*
 	 * The low water mark cannot be bigger than the iodepth
 	 */
-	if (td->iodepth_low > td->iodepth || !td->iodepth_low) {
+	if (o->iodepth_low > o->iodepth || !o->iodepth_low) {
 		/*
 		 * syslet work around - if the workload is sequential,
 		 * we want to let the queue drain all the way down to
 		 * avoid seeking between async threads
 		 */
 		if (!strcmp(td->io_ops->name, "syslet-rw") && !td_random(td))
-			td->iodepth_low = 1;
+			o->iodepth_low = 1;
 		else
-			td->iodepth_low = td->iodepth;
+			o->iodepth_low = o->iodepth;
 	}
 
 	/*
 	 * If batch number isn't set, default to the same as iodepth
 	 */
-	if (td->iodepth_batch > td->iodepth || !td->iodepth_batch)
-		td->iodepth_batch = td->iodepth;
+	if (o->iodepth_batch > o->iodepth || !o->iodepth_batch)
+		o->iodepth_batch = o->iodepth;
+
+	if (o->nr_files > td->files_index)
+		o->nr_files = td->files_index;
 
-	if (td->nr_files > td->files_index)
-		td->nr_files = td->files_index;
+	if (o->open_files > o->nr_files || !o->open_files)
+		o->open_files = o->nr_files;
+
+	if ((o->rate && o->rate_iops) || (o->ratemin && o->rate_iops_min)) {
+		log_err("fio: rate and rate_iops are mutually exclusive\n");
+		return 1;
+	}
+	if ((o->rate < o->ratemin) || (o->rate_iops < o->rate_iops_min)) {
+		log_err("fio: minimum rate exceeds rate\n");
+		return 1;
+	}
 
-	if (td->open_files > td->nr_files || !td->open_files)
-		td->open_files = td->nr_files;
+	if (!o->timeout && o->time_based) {
+		log_err("fio: time_based requires a runtime/timeout setting\n");
+		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;
 }
 
 /*
@@ -278,9 +358,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) {
@@ -300,7 +378,7 @@ static int init_random_state(struct thread_data *td)
 	os_random_seed(seeds[1], &td->verify_state);
 	os_random_seed(seeds[2], &td->rwmix_state);
 
-	if (td->file_service_type == FIO_FSERVICE_RANDOM)
+	if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
 		os_random_seed(seeds[3], &td->next_file_state);
 
 	os_random_seed(seeds[5], &td->file_size_state);
@@ -308,28 +386,13 @@ static int init_random_state(struct thread_data *td)
 	if (!td_random(td))
 		return 0;
 
-	if (td->rand_repeatable)
+	if (td->o.rand_repeatable)
 		seeds[4] = FIO_RANDSEED * td->thread_number;
 
-	if (!td->norandommap) {
-		for_each_file(td, f, i) {
-			blocks = (f->real_file_size + td->rw_min_bs - 1) / td->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
@@ -340,7 +403,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;
@@ -351,51 +413,62 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td == &def_thread)
 		return 0;
 
-	engine = get_engine_name(td->ioengine);
+	/*
+	 * 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) {
 		log_err("fio: failed to load engine %s\n", engine);
-		return 1;
+		goto err;
 	}
 
-	if (td->use_thread)
+	if (td->o.use_thread)
 		nr_thread++;
 	else
 		nr_process++;
 
-	if (td->odirect)
+	if (td->o.odirect)
 		td->io_ops->flags |= FIO_RAWIO;
 
 	file_alloced = 0;
-	if (!td->filename && !td->files_index) {
+	if (!td->o.filename && !td->files_index) {
 		file_alloced = 1;
 
-		if (td->nr_files == 1 && exists_and_not_file(jobname))
+		if (td->o.nr_files == 1 && exists_and_not_file(jobname))
 			add_file(td, jobname);
 		else {
-			for (i = 0; i < td->nr_files; i++) {
+			for (i = 0; i < td->o.nr_files; i++) {
 				sprintf(fname, "%s.%d.%d", jobname, td->thread_number, i);
 				add_file(td, fname);
 			}
 		}
 	}
 
-	fixup_options(td);
+	if (fixup_options(td))
+		goto err;
 
-	for_each_file(td, f, i) {
-		if (td->directory && f->filetype == FIO_TYPE_FILE) {
-			sprintf(fname, "%s/%s", td->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->stonewall || td->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++;
 	}
@@ -409,29 +482,29 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (setup_rate(td))
 		goto err;
 
-	if (td->write_lat_log) {
+	if (td->o.write_lat_log) {
 		setup_log(&td->ts.slat_log);
 		setup_log(&td->ts.clat_log);
 	}
-	if (td->write_bw_log)
+	if (td->o.write_bw_log)
 		setup_log(&td->ts.bw_log);
 
-	if (!td->name)
-		td->name = strdup(jobname);
+	if (!td->o.name)
+		td->o.name = strdup(jobname);
 
 	if (!terse_output) {
 		if (!job_add_num) {
 			if (!strcmp(td->io_ops->name, "cpuio"))
-				log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
+				log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->o.name, td->o.cpuload, td->o.cpucycle);
 			else {
 				char *c1, *c2, *c3, *c4;
 
-				c1 = to_kmg(td->min_bs[DDIR_READ]);
-				c2 = to_kmg(td->max_bs[DDIR_READ]);
-				c3 = to_kmg(td->min_bs[DDIR_WRITE]);
-				c4 = to_kmg(td->max_bs[DDIR_WRITE]);
+				c1 = to_kmg(td->o.min_bs[DDIR_READ]);
+				c2 = to_kmg(td->o.max_bs[DDIR_READ]);
+				c3 = to_kmg(td->o.min_bs[DDIR_WRITE]);
+				c4 = to_kmg(td->o.max_bs[DDIR_WRITE]);
 
-				log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[td->td_ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth);
+				log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->o.name, td->groupid, ddir_str[td->o.td_ddir], c1, c2, c3, c4, td->io_ops->name, td->o.iodepth);
 
 				free(c1);
 				free(c2);
@@ -446,18 +519,19 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	 * recurse add identical jobs, clear numjobs and stonewall options
 	 * as they don't apply to sub-jobs
 	 */
-	numjobs = td->numjobs;
+	numjobs = td->o.numjobs;
 	while (--numjobs) {
 		struct thread_data *td_new = get_new_job(0, td);
 
 		if (!td_new)
 			goto err;
 
-		td_new->numjobs = 1;
-		td_new->stonewall = 0;
+		td_new->o.numjobs = 1;
+		td_new->o.stonewall = 0;
+		td_new->o.new_group = 0;
 
 		if (file_alloced) {
-			td_new->filename = NULL;
+			td_new->o.filename = NULL;
 			td_new->files_index = 0;
 			td_new->files = NULL;
 		}
@@ -468,11 +542,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			goto err;
 	}
 
-	if (td->numjobs > 1) {
-		groupid++;
-		prev_group_jobs = 0;
-	}
-
 	return 0;
 err:
 	put_job(td);
@@ -503,35 +572,65 @@ 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;
+
+	if (!strcmp(file, "-"))
+		f = stdin;
+	else
+		f = fopen(file, "r");
 
-	f = fopen(file, "r");
 	if (!f) {
 		perror("fopen job file");
 		return 1;
 	}
 
 	string = malloc(4096);
-	name = malloc(256);
-	memset(name, 0, 256);
+
+	/*
+	 * it's really 256 + small bit, 280 should suffice
+	 */
+	name = malloc(280);
+	memset(name, 0, 280);
 
 	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)
-			continue;
+		if (sscanf(p, "[%255s]", name) != 1) {
+			log_err("fio: option <%s> outside of [] job section\n", p);
+			break;
+		}
 
 		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;
@@ -542,44 +641,52 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 		 * Seperate multiple job files by a stonewall
 		 */
 		if (!global && stonewall) {
-			td->stonewall = stonewall;
+			td->o.stonewall = stonewall;
 			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
 			 * easier on the user.
 			 */
 			ret |= fio_option_parse(td, p);
+			if (!ret && dump_cmdline)
+				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);
 		}
 	} while (!ret);
 
+	if (dump_cmdline)
+		log_info("\n");
+
 	free(string);
 	free(name);
-	fclose(f);
+	if (f != stdin)
+		fclose(f);
 	return ret;
 }
 
@@ -587,23 +694,16 @@ static int fill_def_thread(void)
 {
 	memset(&def_thread, 0, sizeof(def_thread));
 
-	if (fio_getaffinity(getpid(), &def_thread.cpumask) == -1) {
-		perror("sched_getaffinity");
-		return 1;
-	}
+	fio_getaffinity(getpid(), &def_thread.o.cpumask);
 
 	/*
 	 * fill default options
 	 */
 	fio_fill_default_options(&def_thread);
 
-	def_thread.timeout = def_timeout;
-	def_thread.write_bw_log = write_bw_log;
-	def_thread.write_lat_log = write_lat_log;
-
-#ifdef FIO_HAVE_DISK_UTIL
-	def_thread.do_disk_util = 1;
-#endif
+	def_thread.o.timeout = def_timeout;
+	def_thread.o.write_bw_log = write_bw_log;
+	def_thread.o.write_lat_log = write_lat_log;
 
 	return 0;
 }
@@ -653,13 +753,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");
@@ -668,7 +771,67 @@ 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");
+	printf("\t--eta=when\tWhen ETA estimate should be printed\n");
+	printf("\t          \tMay be \"always\", \"never\" or \"auto\"\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[])
 {
@@ -698,19 +861,34 @@ 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 FIO_GETOPT_JOB: {
 			const char *opt = long_options[lidx].name;
 			char *val = optarg;
 
 			if (!strncmp(opt, "name", 4) && td) {
-				ret = add_job(td, td->name ?: "fio", 0);
+				ret = add_job(td, td->o.name ?: "fio", 0);
 				if (ret) {
 					put_job(td);
 					return 0;
@@ -718,7 +896,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)
@@ -739,7 +921,7 @@ static int parse_cmd_line(int argc, char *argv[])
 		if (dont_add_job)
 			put_job(td);
 		else {
-			ret = add_job(td, td->name ?: "fio", 0);
+			ret = add_job(td, td->o.name ?: "fio", 0);
 			if (ret)
 				put_job(td);
 		}
@@ -755,7 +937,6 @@ static int parse_cmd_line(int argc, char *argv[])
 	return ini_idx;
 }
 
-
 int parse_options(int argc, char *argv[])
 {
 	int job_files, i;
@@ -781,9 +962,14 @@ 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");
+		usage(argv[0]);
 		return 1;
 	}