X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=4ac2783d28a4ced91c1076e3b069a3e4bc659a5b;hp=616c51f27ff738e7d2d2bd3eddbf7c924d693c3b;hb=fd28ca4948aa67b76585c6c23d7f70a2cdc7a0d5;hpb=a00735e66f9ec42549da94eba3170e543b542904

diff --git a/init.c b/init.c
index 616c51f2..4ac2783d 100644
--- a/init.c
+++ b/init.c
@@ -29,7 +29,7 @@
 #define DEF_IO_ENGINE_NAME	"sync"
 #define DEF_SEQUENTIAL		(1)
 #define DEF_RAND_REPEAT		(1)
-#define DEF_OVERWRITE		(1)
+#define DEF_OVERWRITE		(0)
 #define DEF_INVALIDATE		(1)
 #define DEF_SYNCIO		(0)
 #define DEF_RANDSEED		(0xb1899bedUL)
@@ -48,10 +48,12 @@
 #define DEF_RWMIX_READ		(50)
 #define DEF_NICE		(0)
 #define DEF_NR_FILES		(1)
-#define DEF_UNLINK		(0)
+#define DEF_UNLINK		(1)
 #define DEF_WRITE_BW_LOG	(0)
 #define DEF_WRITE_LAT_LOG	(0)
 #define DEF_NO_RAND_MAP		(0)
+#define DEF_HUGEPAGE_SIZE	FIO_HUGE_PAGE
+#define DEF_THINKTIME_BLOCKS	(1)
 
 #define td_var_offset(var)	((size_t) &((struct thread_data *)0)->var)
 
@@ -60,8 +62,10 @@ static int str_ioengine_cb(void *, const char *);
 static int str_mem_cb(void *, const char *);
 static int str_verify_cb(void *, const char *);
 static int str_lockmem_cb(void *, unsigned long *);
+#ifdef FIO_HAVE_IOPRIO
 static int str_prio_cb(void *, unsigned int *);
 static int str_prioclass_cb(void *, unsigned int *);
+#endif
 static int str_exitall_cb(void);
 static int str_cpumask_cb(void *, unsigned int *);
 
@@ -73,307 +77,355 @@ static struct fio_option options[] = {
 		.name	= "name",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(name),
+		.help	= "Name of this job",
 	},
 	{
 		.name	= "directory",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(directory),
+		.help	= "Directory to store files in",
 	},
 	{
 		.name	= "filename",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(filename),
+		.help	= "Force the use of a specific file",
 	},
 	{
 		.name	= "rw",
 		.type	= FIO_OPT_STR,
 		.cb	= str_rw_cb,
+		.help	= "IO direction (read, write, rw, etc)",
 	},
 	{
 		.name	= "ioengine",
 		.type	= FIO_OPT_STR,
 		.cb	= str_ioengine_cb,
+		.help	= "IO engine to use (sync, aio, etc)",
 	},
 	{
 		.name	= "mem",
 		.type	= FIO_OPT_STR,
 		.cb	= str_mem_cb,
+		.help	= "Backing type for IO buffers (malloc, shm, etc)",
 	},
 	{
 		.name	= "verify",
 		.type	= FIO_OPT_STR,
 		.cb	= str_verify_cb,
+		.help	= "Verify sum function (md5 or crc32)",
 	},
 	{
 		.name	= "write_iolog",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(write_iolog_file),
+		.help	= "Store IO pattern to file",
 	},
 	{
 		.name	= "read_iolog",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(read_iolog_file),
+		.help	= "Playback IO pattern from file",
 	},
 	{
 		.name	= "exec_prerun",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(exec_prerun),
+		.help	= "Execute this file prior to running job",
 	},
 	{
 		.name	= "exec_postrun",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(exec_postrun),
+		.help	= "Execute this file after running job",
 	},
 #ifdef FIO_HAVE_IOSCHED_SWITCH
 	{
 		.name	= "ioscheduler",
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(ioscheduler),
+		.help	= "Use this IO scheduler on the backing device",
 	},
 #endif
 	{
 		.name	= "size",
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(total_file_size),
+		.help	= "Size of device or file",
 	},
 	{
 		.name	= "bs",
-		.type	= FIO_OPT_STR_VAL,
-		.off1	= td_var_offset(bs[DDIR_READ]),
-	},
-	{
-		.name	= "read_bs",
-		.type	= FIO_OPT_STR_VAL,
+		.type	= FIO_OPT_STR_VAL_INT,
 		.off1	= td_var_offset(bs[DDIR_READ]),
-	},
-	{
-		.name	= "write_bs",
-		.type	= FIO_OPT_STR_VAL,
-		.off1	= td_var_offset(bs[DDIR_WRITE]),
+		.off2	= td_var_offset(bs[DDIR_WRITE]),
+		.help	= "Block size unit",
 	},
 	{
 		.name	= "offset",
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(start_offset),
+		.help	= "Start IO from this offset",
 	},
 	{
 		.name	= "zonesize",
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(zone_size),
+		.help	= "Give size of an IO zone",
 	},
 	{
 		.name	= "zoneskip",
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(zone_skip),
+		.help	= "Space between IO zones",
 	},
 	{
 		.name	= "lockmem",
 		.type	= FIO_OPT_STR_VAL,
 		.cb	= str_lockmem_cb,
+		.help	= "Lock down this amount of memory",
 	},
 	{
 		.name	= "bsrange",
 		.type	= FIO_OPT_RANGE,
 		.off1	= td_var_offset(min_bs[DDIR_READ]),
 		.off2	= td_var_offset(max_bs[DDIR_READ]),
-	},
-	{
-		.name	= "read_bsrange",
-		.type	= FIO_OPT_RANGE,
-		.off1	= td_var_offset(min_bs[DDIR_READ]),
-		.off2	= td_var_offset(max_bs[DDIR_READ]),
-	},
-	{
-		.name	= "write_bsrange",
-		.type	= FIO_OPT_RANGE,
-		.off1	= td_var_offset(min_bs[DDIR_WRITE]),
-		.off2	= td_var_offset(max_bs[DDIR_WRITE]),
+		.off3	= td_var_offset(min_bs[DDIR_WRITE]),
+		.off4	= td_var_offset(max_bs[DDIR_WRITE]),
+		.help	= "Set block size range",
 	},
 	{
 		.name	= "nrfiles",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(nr_files),
+		.help	= "Split job workload between this number of files",
 	},
 	{
 		.name	= "iodepth",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(iodepth),
+		.help	= "Amount of IO buffers to keep in flight",
 	},
 	{
 		.name	= "fsync",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(fsync_blocks),
+		.help	= "Issue fsync for writes every given number of blocks",
 	},
 	{
 		.name	= "rwmixcycle",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(rwmixcycle),
+		.help	= "Cycle period for mixed read/write workloads",
 	},
 	{
 		.name	= "rwmixread",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(rwmixread),
 		.max_val= 100,
+		.help	= "Percentage of mixed workload that is reads",
 	},
 	{
 		.name	= "rwmixwrite",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(rwmixwrite),
 		.max_val= 100,
+		.help	= "Percentage of mixed workload that is writes",
 	},
 	{
 		.name	= "nice",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(nice),
+		.help	= "Set job CPU nice value",
 	},
 #ifdef FIO_HAVE_IOPRIO
 	{
 		.name	= "prio",
 		.type	= FIO_OPT_INT,
 		.cb	= str_prio_cb,
+		.help	= "Set job IO priority value",
 	},
 	{
 		.name	= "prioclass",
 		.type	= FIO_OPT_INT,
 		.cb	= str_prioclass_cb,
+		.help	= "Set job IO priority class",
 	},
 #endif
 	{
 		.name	= "thinktime",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(thinktime)
+		.off1	= td_var_offset(thinktime),
+		.help	= "Idle time between IO buffers",
+	},
+	{
+		.name	= "thinktime_blocks",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(thinktime_blocks),
+		.help	= "IO buffer period between 'thinktime'",
 	},
 	{
 		.name	= "rate",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rate)
+		.off1	= td_var_offset(rate),
+		.help	= "Set bandwidth rate",
 	},
 	{
 		.name	= "ratemin",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(ratemin)
+		.off1	= td_var_offset(ratemin),
+		.help	= "The bottom limit accepted",
 	},
 	{
 		.name	= "ratecycle",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(ratecycle)
+		.off1	= td_var_offset(ratecycle),
+		.name	= "Window average for rate limits",
 	},
 	{
 		.name	= "startdelay",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(start_delay)
+		.off1	= td_var_offset(start_delay),
+		.help	= "Only start job when this period has passed",
 	},
 	{
 		.name	= "timeout",
 		.type	= FIO_OPT_STR_VAL_TIME,
-		.off1	= td_var_offset(timeout)
+		.off1	= td_var_offset(timeout),
+		.help	= "Stop workload when this amount of time has passed",
 	},
 	{
 		.name	= "invalidate",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(invalidate_cache)
+		.off1	= td_var_offset(invalidate_cache),
+		.help	= "Invalidate buffer/page cache prior to running job",
 	},
 	{
 		.name	= "sync",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(sync_io)
+		.off1	= td_var_offset(sync_io),
+		.help	= "Use O_SYNC for buffered writes",
 	},
 	{
 		.name	= "bwavgtime",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(bw_avg_time)
+		.off1	= td_var_offset(bw_avg_time),
+		.help	= "Time window over which to calculate bandwidth",
 	},
 	{
 		.name	= "create_serialize",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(create_serialize)
+		.off1	= td_var_offset(create_serialize),
+		.help	= "Serialize creating of job files",
 	},
 	{
 		.name	= "create_fsync",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(create_fsync)
+		.off1	= td_var_offset(create_fsync),
+		.help	= "Fsync file after creation",
 	},
 	{
 		.name	= "loops",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(loops)
+		.off1	= td_var_offset(loops),
+		.help	= "Number of times to run the job",
 	},
 	{
 		.name	= "numjobs",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(numjobs)
+		.off1	= td_var_offset(numjobs),
+		.help	= "Duplicate this job this many times",
 	},
 	{
 		.name	= "cpuload",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(cpuload)
+		.off1	= td_var_offset(cpuload),
+		.help	= "Use this percentage of CPU",
 	},
 	{
 		.name	= "cpuchunks",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(cpucycle)
+		.off1	= td_var_offset(cpucycle),
+		.help	= "Length of the CPU burn cycles",
 	},
 	{
 		.name	= "direct",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(odirect)
+		.off1	= td_var_offset(odirect),
+		.help	= "Use O_DIRECT IO",
 	},
 	{
 		.name	= "overwrite",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(overwrite)
+		.off1	= td_var_offset(overwrite),
+		.help	= "When writing, set whether to overwrite current data",
 	},
 #ifdef FIO_HAVE_CPU_AFFINITY
 	{
 		.name	= "cpumask",
 		.type	= FIO_OPT_INT,
 		.cb	= str_cpumask_cb,
+		.help	= "CPU affinity mask",
 	},
 #endif
 	{
 		.name	= "end_fsync",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(end_fsync)
+		.off1	= td_var_offset(end_fsync),
+		.help	= "Include fsync at the end of job",
 	},
 	{
 		.name	= "unlink",
-		.type	= FIO_OPT_STR_SET,
+		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(unlink),
+		.help	= "Unlink files after job has completed",
 	},
 	{
 		.name	= "exitall",
 		.type	= FIO_OPT_STR_SET,
 		.cb	= str_exitall_cb,
+		.help	= "Terminate all jobs when one exits",
 	},
 	{
 		.name	= "stonewall",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(stonewall),
+		.help	= "Insert a hard barrier between this job and previous",
 	},
 	{
 		.name	= "thread",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(thread),
+		.help	= "Use threads instead of forks",
 	},
 	{
 		.name	= "write_bw_log",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(write_bw_log),
+		.help	= "Write log of bandwidth during run",
 	},
 	{
 		.name	= "write_lat_log",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(write_lat_log),
+		.help	= "Write log of latency during run",
 	},
 	{
 		.name	= "norandommap",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(norandommap),
+		.help	= "Accept potential duplicate random blocks",
 	},
 	{
 		.name	= "bs_unaligned",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(bs_unaligned),
+		.help	= "Don't sector align IO buffer sizes",
+	},
+	{
+		.name	= "hugepage-size",
+		.type	= FIO_OPT_STR_VAL,
+		.off1	= td_var_offset(hugepage_size),
+		.help	= "When using hugepages, specify size of each page",
 	},
 	{
 		.name = NULL,
@@ -419,6 +471,16 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 		.has_arg	= no_argument,
 		.val		= 'v',
 	},
+	{
+		.name		= "help",
+		.has_arg	= no_argument,
+		.val		= 'h',
+	},
+	{
+		.name		= "cmdhelp",
+		.has_arg	= required_argument,
+		.val		= 'c',
+	},
 	{
 		.name		= NULL,
 	},
@@ -426,7 +488,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 
 static int def_timeout = DEF_TIMEOUT;
 
-static char fio_version_string[] = "fio 1.7";
+static char fio_version_string[] = "fio 1.11";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -434,7 +496,6 @@ static int max_jobs = MAX_JOBS;
 struct thread_data def_thread;
 struct thread_data *threads = NULL;
 
-int rate_quit = 0;
 int exitall_on_terminate = 0;
 int terse_output = 0;
 unsigned long long mlock_size = 0;
@@ -506,16 +567,14 @@ static void fixup_options(struct thread_data *td)
 	if (td_read(td) || td_rw(td))
 		td->overwrite = 1;
 
-	if (td->bs[DDIR_READ] != DEF_BS)
-		td->bs[DDIR_WRITE] = td->bs[DDIR_READ];
 	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_READ];
+		td->min_bs[DDIR_WRITE]= td->bs[DDIR_WRITE];
 	if (!td->max_bs[DDIR_WRITE])
-		td->max_bs[DDIR_WRITE] = td->bs[DDIR_READ];
+		td->max_bs[DDIR_WRITE] = td->bs[DDIR_WRITE];
 
 	td->rw_min_bs = min(td->min_bs[DDIR_READ], td->min_bs[DDIR_WRITE]);
 
@@ -528,6 +587,33 @@ static void fixup_options(struct thread_data *td)
 	}
 	if (td->bs_unaligned && (td->odirect || td->io_ops->flags & FIO_RAWIO))
 		log_err("fio: bs_unaligned may not work with raw io\n");
+
+	/*
+	 * O_DIRECT and char doesn't mix, clear that flag if necessary.
+	 */
+	if (td->filetype == FIO_TYPE_CHAR && td->odirect)
+		td->odirect = 0;
+}
+
+/*
+ * This function leaks the buffer
+ */
+static char *to_kmg(unsigned int val)
+{
+	char *buf = malloc(32);
+	char post[] = { 0, 'K', 'M', 'G', 'P', 0 };
+	char *p = post;
+
+	do {
+		if (val & 1023)
+			break;
+
+		val >>= 10;
+		p++;
+	} while (*p);
+
+	snprintf(buf, 31, "%u%c", val, *p);
+	return buf;
 }
 
 /*
@@ -537,25 +623,12 @@ static void fixup_options(struct thread_data *td)
  */
 static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
-	char *ddir_str[] = { "read", "write", "randread", "randwrite",
-			     "rw", NULL, "randrw" };
+	const char *ddir_str[] = { "read", "write", "randread", "randwrite",
+				   "rw", NULL, "randrw" };
 	struct stat sb;
 	int numjobs, ddir, i;
 	struct fio_file *f;
 
-#ifndef FIO_HAVE_LIBAIO
-	if (td->io_engine == FIO_LIBAIO) {
-		log_err("Linux libaio not available\n");
-		return 1;
-	}
-#endif
-#ifndef FIO_HAVE_POSIXAIO
-	if (td->io_engine == FIO_POSIXAIO) {
-		log_err("posix aio not available\n");
-		return 1;
-	}
-#endif
-
 	/*
 	 * the def_thread is just for options, it's not a real job
 	 */
@@ -576,8 +649,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td->odirect)
 		td->io_ops->flags |= FIO_RAWIO;
 
-	fixup_options(td);
-
 	td->filetype = FIO_TYPE_FILE;
 	if (!stat(jobname, &sb)) {
 		if (S_ISBLK(sb.st_mode))
@@ -586,6 +657,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			td->filetype = FIO_TYPE_CHAR;
 	}
 
+	fixup_options(td);
+
 	if (td->filename)
 		td->nr_uniq_files = 1;
 	else
@@ -594,10 +667,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (td->filetype == FIO_TYPE_FILE || td->filename) {
 		char tmp[PATH_MAX];
 		int len = 0;
-		int i;
 
 		if (td->directory && td->directory[0] != '\0')
-			sprintf(tmp, "%s/", td->directory);
+			len = sprintf(tmp, "%s/", td->directory);
 
 		td->files = malloc(sizeof(struct fio_file) * td->nr_files);
 
@@ -656,8 +728,21 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		if (!job_add_num) {
 			if (td->io_ops->flags & FIO_CPUIO)
 				fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
-			else
-				fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d/%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs[DDIR_READ], td->max_bs[DDIR_READ], td->min_bs[DDIR_WRITE], td->max_bs[DDIR_WRITE], td->rate, td->io_ops->name, td->iodepth);
+			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]);
+
+				fprintf(f_out, "%s: (g=%d): rw=%s, odir=%u, bs=%s-%s/%s-%s, rate=%u, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[ddir], td->odirect, c1, c2, c3, c4, td->rate, td->io_ops->name, td->iodepth);
+
+				free(c1);
+				free(c2);
+				free(c3);
+				free(c4);
+			}
 		} else if (job_add_num == 1)
 			fprintf(f_out, "...\n");
 	}
@@ -786,12 +871,12 @@ static int str_rw_cb(void *data, const char *mem)
 		td->sequential = 0;
 		return 0;
 	} else if (!strncmp(mem, "rw", 2)) {
-		td->ddir = 0;
+		td->ddir = DDIR_READ;
 		td->iomix = 1;
 		td->sequential = 1;
 		return 0;
 	} else if (!strncmp(mem, "randrw", 6)) {
-		td->ddir = 0;
+		td->ddir = DDIR_READ;
 		td->iomix = 1;
 		td->sequential = 0;
 		return 0;
@@ -820,6 +905,22 @@ static int str_verify_cb(void *data, const char *mem)
 	return 1;
 }
 
+/*
+ * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
+ */
+static char *get_mmap_file(const char *str)
+{
+	char *p = strstr(str, ":");
+
+	if (!p)
+		return NULL;
+
+	p++;
+	strip_blank_front(&p);
+	strip_blank_end(p);
+	return strdup(p);
+}
+
 static int str_mem_cb(void *data, const char *mem)
 {
 	struct thread_data *td = data;
@@ -827,15 +928,45 @@ static int str_mem_cb(void *data, const char *mem)
 	if (!strncmp(mem, "malloc", 6)) {
 		td->mem_type = MEM_MALLOC;
 		return 0;
-	} else if (!strncmp(mem, "shm", 3)) {
-		td->mem_type = MEM_SHM;
+	} else if (!strncmp(mem, "mmaphuge", 8)) {
+#ifdef FIO_HAVE_HUGETLB
+		/*
+		 * mmaphuge must be appended with the actual file
+		 */
+		td->mmapfile = get_mmap_file(mem);
+		if (!td->mmapfile) {
+			log_err("fio: mmaphuge:/path/to/file\n");
+			return 1;
+		}
+
+		td->mem_type = MEM_MMAPHUGE;
 		return 0;
+#else
+		log_err("fio: mmaphuge not available\n");
+		return 1;
+#endif
 	} else if (!strncmp(mem, "mmap", 4)) {
+		/*
+		 * Check if the user wants file backed memory. It's ok
+		 * if there's no file given, we'll just use anon mamp then.
+		 */
+		td->mmapfile = get_mmap_file(mem);
 		td->mem_type = MEM_MMAP;
 		return 0;
+	} else if (!strncmp(mem, "shmhuge", 7)) {
+#ifdef FIO_HAVE_HUGETLB
+		td->mem_type = MEM_SHMHUGE;
+		return 0;
+#else
+		log_err("fio: shmhuge not available\n");
+		return 1;
+#endif
+	} else if (!strncmp(mem, "shm", 3)) {
+		td->mem_type = MEM_SHM;
+		return 0;
 	}
 
-	log_err("fio: mem type: malloc, shm, mmap\n");
+	log_err("fio: mem type: malloc, shm, shmhuge, mmap, mmaphuge\n");
 	return 1;
 }
 
@@ -847,7 +978,8 @@ static int str_ioengine_cb(void *data, const char *str)
 	if (td->io_ops)
 		return 0;
 
-	log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
+	log_err("fio: ioengine= libaio, posixaio, sync, mmap, sgio, splice, cpu, null\n");
+	log_err("fio: or specify path to dynamic ioengine module\n");
 	return 1;
 }
 
@@ -857,6 +989,7 @@ static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
 	return 0;
 }
 
+#ifdef FIO_HAVE_IOPRIO
 static int str_prioclass_cb(void *data, unsigned int *val)
 {
 	struct thread_data *td = data;
@@ -872,6 +1005,7 @@ static int str_prio_cb(void *data, unsigned int *val)
 	td->ioprio |= *val;
 	return 0;
 }
+#endif
 
 static int str_exitall_cb(void)
 {
@@ -890,7 +1024,7 @@ static int str_cpumask_cb(void *data, unsigned int *val)
 /*
  * This is our [ini] type file parser.
  */
-int parse_jobs_ini(char *file, int stonewall_flag)
+static int parse_jobs_ini(char *file, int stonewall_flag)
 {
 	unsigned int global;
 	struct thread_data *td;
@@ -1018,6 +1152,8 @@ static int fill_def_thread(void)
 	def_thread.write_bw_log = write_bw_log;
 	def_thread.write_lat_log = write_lat_log;
 	def_thread.norandommap = DEF_NO_RAND_MAP;
+	def_thread.hugepage_size = DEF_HUGEPAGE_SIZE;
+	def_thread.thinktime_blocks = DEF_THINKTIME_BLOCKS;
 #ifdef FIO_HAVE_DISK_UTIL
 	def_thread.do_disk_util = 1;
 #endif
@@ -1034,6 +1170,8 @@ static void usage(void)
 	printf("\t--bandwidth-log\tGenerate per-job bandwidth logs\n");
 	printf("\t--minimal\tMinimal (terse) output\n");
 	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");
 }
 
 static int parse_cmd_line(int argc, char *argv[])
@@ -1066,6 +1204,9 @@ static int parse_cmd_line(int argc, char *argv[])
 		case 'h':
 			usage();
 			exit(0);
+		case 'c':
+			show_cmd_help(options, optarg);
+			exit(0);
 		case 'v':
 			printf("%s\n", fio_version_string);
 			exit(0);
@@ -1098,7 +1239,6 @@ static int parse_cmd_line(int argc, char *argv[])
 			break;
 		}
 		default:
-			printf("optarg <<%s>>\n", argv[optind]);
 			break;
 		}
 	}