X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=956ff5f0a48b5a98699b43704788697cdf5f0487;hp=37b84e68bb1ded485f828e4843bfeacbd3863e0c;hb=e49499f8738562e014867ad693a999646d5e1bfb;hpb=6da1fa7f0a8d7e588dc0ea40a5e175edded9a8ac

diff --git a/init.c b/init.c
index 37b84e68..956ff5f0 100644
--- a/init.c
+++ b/init.c
@@ -41,6 +41,12 @@ static int str_cpumask_cb(void *, unsigned int *);
  * Map of job/command line options
  */
 static struct fio_option options[] = {
+	{
+		.name	= "description",
+		.type	= FIO_OPT_STR_STORE,
+		.off1	= td_var_offset(description),
+		.help	= "Text job description",
+	},
 	{
 		.name	= "name",
 		.type	= FIO_OPT_STR_STORE,
@@ -63,29 +69,162 @@ static struct fio_option options[] = {
 		.name	= "rw",
 		.type	= FIO_OPT_STR,
 		.cb	= str_rw_cb,
-		.help	= "IO direction (read, write, rw, etc)",
+		.help	= "IO direction",
 		.def	= "read",
+		.posval	= { "read", "write", "randwrite", "randread", "rw",
+				"randrw", },
 	},
 	{
 		.name	= "ioengine",
 		.type	= FIO_OPT_STR,
 		.cb	= str_ioengine_cb,
-		.help	= "IO engine to use (sync, aio, etc)",
+		.help	= "IO engine to use",
 		.def	= "sync",
+		.posval	= { "sync", "libaio", "posixaio", "mmap", "splice",
+				"sg", "null", "net", "syslet-rw" },
+	},
+	{
+		.name	= "iodepth",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(iodepth),
+		.help	= "Amount of IO buffers to keep in flight",
+		.def	= "1",
+	},
+	{
+		.name	= "iodepth_low",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(iodepth_low),
+		.help	= "Low water mark for queuing depth",
+	},
+	{
+		.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_INT,
+		.off1	= td_var_offset(bs[DDIR_READ]),
+		.off2	= td_var_offset(bs[DDIR_WRITE]),
+		.help	= "Block size unit",
+		.def	= "4k",
+	},
+	{
+		.name	= "bsrange",
+		.type	= FIO_OPT_RANGE,
+		.off1	= td_var_offset(min_bs[DDIR_READ]),
+		.off2	= td_var_offset(max_bs[DDIR_READ]),
+		.off3	= td_var_offset(min_bs[DDIR_WRITE]),
+		.off4	= td_var_offset(max_bs[DDIR_WRITE]),
+		.help	= "Set block size range (in more detail than bs)",
+	},
+	{
+		.name	= "bs_unaligned",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= td_var_offset(bs_unaligned),
+		.help	= "Don't sector align IO buffer sizes",
+	},
+	{
+		.name	= "offset",
+		.type	= FIO_OPT_STR_VAL,
+		.off1	= td_var_offset(start_offset),
+		.help	= "Start IO from this offset",
+		.def	= "0",
+	},
+	{
+		.name	= "randrepeat",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(rand_repeatable),
+		.help	= "Use repeatable random IO pattern",
+		.def	= "1",
+	},
+	{
+		.name	= "norandommap",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= td_var_offset(norandommap),
+		.help	= "Accept potential duplicate random blocks",
+	},
+	{
+		.name	= "nrfiles",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(nr_files),
+		.help	= "Split job workload between this number of files",
+		.def	= "1",
+	},
+	{
+		.name	= "fsync",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(fsync_blocks),
+		.help	= "Issue fsync for writes every given number of blocks",
+		.def	= "0",
+	},
+	{
+		.name	= "direct",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(odirect),
+		.help	= "Use O_DIRECT IO (negates buffered)",
+		.def	= "0",
+	},
+	{
+		.name	= "buffered",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(odirect),
+		.neg	= 1,
+		.help	= "Use buffered IO (negates direct)",
+		.def	= "1",
+	},
+	{
+		.name	= "overwrite",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(overwrite),
+		.help	= "When writing, set whether to overwrite current data",
+		.def	= "0",
+	},
+	{
+		.name	= "loops",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(loops),
+		.help	= "Number of times to run the job",
+		.def	= "1",
+	},
+	{
+		.name	= "numjobs",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(numjobs),
+		.help	= "Duplicate this job this many times",
+		.def	= "1",
+	},
+	{
+		.name	= "startdelay",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(start_delay),
+		.help	= "Only start job when this period has passed",
+		.def	= "0",
+	},
+	{
+		.name	= "runtime",
+		.alias	= "timeout",
+		.type	= FIO_OPT_STR_VAL_TIME,
+		.off1	= td_var_offset(timeout),
+		.help	= "Stop workload when this amount of time has passed",
+		.def	= "0",
 	},
 	{
 		.name	= "mem",
 		.type	= FIO_OPT_STR,
 		.cb	= str_mem_cb,
-		.help	= "Backing type for IO buffers (malloc, shm, etc)",
+		.help	= "Backing type for IO buffers",
 		.def	= "malloc",
+		.posval	=  { "malloc", "shm", "shmhuge", "mmap", "mmaphuge", },
 	},
 	{
 		.name	= "verify",
 		.type	= FIO_OPT_STR,
 		.cb	= str_verify_cb,
-		.help	= "Verify sum function (md5 or crc32)",
+		.help	= "Verify sum function",
 		.def	= "0",
+		.posval	= { "crc32", "md5", },
 	},
 	{
 		.name	= "write_iolog",
@@ -119,27 +258,6 @@ static struct fio_option options[] = {
 		.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_INT,
-		.off1	= td_var_offset(bs[DDIR_READ]),
-		.off2	= td_var_offset(bs[DDIR_WRITE]),
-		.help	= "Block size unit",
-		.def	= "4k",
-	},
-	{
-		.name	= "offset",
-		.type	= FIO_OPT_STR_VAL,
-		.off1	= td_var_offset(start_offset),
-		.help	= "Start IO from this offset",
-		.def	= "0",
-	},
 	{
 		.name	= "zonesize",
 		.type	= FIO_OPT_STR_VAL,
@@ -161,43 +279,6 @@ static struct fio_option options[] = {
 		.help	= "Lock down this amount of memory",
 		.def	= "0",
 	},
-	{
-		.name	= "bsrange",
-		.type	= FIO_OPT_RANGE,
-		.off1	= td_var_offset(min_bs[DDIR_READ]),
-		.off2	= td_var_offset(max_bs[DDIR_READ]),
-		.off3	= td_var_offset(min_bs[DDIR_WRITE]),
-		.off4	= td_var_offset(max_bs[DDIR_WRITE]),
-		.help	= "Set block size range",
-	},
-	{
-		.name	= "randrepeat",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rand_repeatable),
-		.help	= "Use repeatable random IO pattern",
-		.def	= "1",
-	},
-	{
-		.name	= "nrfiles",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(nr_files),
-		.help	= "Split job workload between this number of files",
-		.def	= "1",
-	},
-	{
-		.name	= "iodepth",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(iodepth),
-		.help	= "Amount of IO buffers to keep in flight",
-		.def	= "1",
-	},
-	{
-		.name	= "fsync",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(fsync_blocks),
-		.help	= "Issue fsync for writes every given number of blocks",
-		.def	= "0",
-	},
 	{
 		.name	= "rwmixcycle",
 		.type	= FIO_OPT_INT,
@@ -226,6 +307,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(nice),
 		.help	= "Set job CPU nice value",
+		.minval	= -19,
 		.maxval	= 20,
 		.def	= "0",
 	},
@@ -235,19 +317,30 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_INT,
 		.cb	= str_prio_cb,
 		.help	= "Set job IO priority value",
+		.minval	= 0,
+		.maxval	= 7,
 	},
 	{
 		.name	= "prioclass",
 		.type	= FIO_OPT_INT,
 		.cb	= str_prioclass_cb,
 		.help	= "Set job IO priority class",
+		.minval	= 0,
+		.maxval	= 3,
 	},
 #endif
 	{
 		.name	= "thinktime",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(thinktime),
-		.help	= "Idle time between IO buffers",
+		.help	= "Idle time between IO buffers (usec)",
+		.def	= "0",
+	},
+	{
+		.name	= "thinktime_spin",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(thinktime_spin),
+		.help	= "Start thinktime by spinning this amount (usec)",
 		.def	= "0",
 	},
 	{
@@ -276,30 +369,16 @@ static struct fio_option options[] = {
 		.help	= "Window average for rate limits (msec)",
 		.def	= "1000",
 	},
-	{
-		.name	= "startdelay",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(start_delay),
-		.help	= "Only start job when this period has passed",
-		.def	= "0",
-	},
-	{
-		.name	= "timeout",
-		.type	= FIO_OPT_STR_VAL_TIME,
-		.off1	= td_var_offset(timeout),
-		.help	= "Stop workload when this amount of time has passed",
-		.def	= "0",
-	},
 	{
 		.name	= "invalidate",
-		.type	= FIO_OPT_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(invalidate_cache),
 		.help	= "Invalidate buffer/page cache prior to running job",
 		.def	= "1",
 	},
 	{
 		.name	= "sync",
-		.type	= FIO_OPT_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(sync_io),
 		.help	= "Use O_SYNC for buffered writes",
 		.def	= "0",
@@ -313,32 +392,18 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "create_serialize",
-		.type	= FIO_OPT_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(create_serialize),
 		.help	= "Serialize creating of job files",
 		.def	= "1",
 	},
 	{
 		.name	= "create_fsync",
-		.type	= FIO_OPT_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(create_fsync),
 		.help	= "Fsync file after creation",
 		.def	= "1",
 	},
-	{
-		.name	= "loops",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(loops),
-		.help	= "Number of times to run the job",
-		.def	= "1",
-	},
-	{
-		.name	= "numjobs",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(numjobs),
-		.help	= "Duplicate this job this many times",
-		.def	= "1",
-	},
 	{
 		.name	= "cpuload",
 		.type	= FIO_OPT_INT,
@@ -351,20 +416,6 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(cpucycle),
 		.help	= "Length of the CPU burn cycles",
 	},
-	{
-		.name	= "direct",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(odirect),
-		.help	= "Use O_DIRECT IO",
-		.def	= "1",
-	},
-	{
-		.name	= "overwrite",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(overwrite),
-		.help	= "When writing, set whether to overwrite current data",
-		.def	= "0",
-	},
 #ifdef FIO_HAVE_CPU_AFFINITY
 	{
 		.name	= "cpumask",
@@ -375,17 +426,17 @@ static struct fio_option options[] = {
 #endif
 	{
 		.name	= "end_fsync",
-		.type	= FIO_OPT_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(end_fsync),
 		.help	= "Include fsync at the end of job",
 		.def	= "0",
 	},
 	{
 		.name	= "unlink",
-		.type	= FIO_OPT_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(unlink),
 		.help	= "Unlink created files after job has completed",
-		.def	= "1",
+		.def	= "0",
 	},
 	{
 		.name	= "exitall",
@@ -402,7 +453,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "thread",
 		.type	= FIO_OPT_STR_SET,
-		.off1	= td_var_offset(thread),
+		.off1	= td_var_offset(use_thread),
 		.help	= "Use threads instead of forks",
 	},
 	{
@@ -417,18 +468,6 @@ static struct fio_option options[] = {
 		.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,
@@ -512,7 +551,7 @@ FILE *f_out = NULL;
 FILE *f_err = NULL;
 
 static int write_lat_log = 0;
-static int write_bw_log = 0;
+int write_bw_log = 0;
 
 /*
  * Return a free job structure.
@@ -538,6 +577,9 @@ static void put_job(struct thread_data *td)
 	if (td == &def_thread)
 		return;
 
+	if (td->error)
+		fprintf(f_out, "fio: %s\n", td->verror);
+
 	memset(&threads[td->thread_number - 1], 0, sizeof(*td));
 	thread_number--;
 }
@@ -602,6 +644,18 @@ static void fixup_options(struct thread_data *td)
 	 */
 	if (td->filetype == FIO_TYPE_CHAR && td->odirect)
 		td->odirect = 0;
+
+	/*
+	 * thinktime_spin must be less than thinktime
+	 */
+	if (td->thinktime_spin > td->thinktime)
+		td->thinktime_spin = td->thinktime;
+
+	/*
+	 * The low water mark cannot be bigger than the iodepth
+	 */
+	if (td->iodepth_low > td->iodepth || !td->iodepth_low)
+		td->iodepth_low = td->iodepth;
 }
 
 /*
@@ -610,7 +664,7 @@ static void fixup_options(struct thread_data *td)
 static char *to_kmg(unsigned int val)
 {
 	char *buf = malloc(32);
-	char post[] = { 0, 'K', 'M', 'G', 'P', 0 };
+	char post[] = { 0, 'K', 'M', 'G', 'P', 'E', 0 };
 	char *p = post;
 
 	do {
@@ -650,7 +704,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		td->io_ops->flags |= FIO_RAWIO;
 
 	td->filetype = FIO_TYPE_FILE;
-	if (!stat(jobname, &sb)) {
+	if (td->filename && !lstat(td->filename, &sb)) {
 		if (S_ISBLK(sb.st_mode))
 			td->filetype = FIO_TYPE_BD;
 		else if (S_ISCHR(sb.st_mode))
@@ -668,8 +722,18 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		char tmp[PATH_MAX];
 		int len = 0;
 
-		if (td->directory && td->directory[0] != '\0')
+		if (td->directory && td->directory[0] != '\0') {
+			if (lstat(td->directory, &sb) < 0) {
+				log_err("fio: %s is not a directory\n", td->directory);
+				td_verror(td, errno);
+				return 1;
+			}
+			if (!S_ISDIR(sb.st_mode)) {
+				log_err("fio: %s is not a directory\n", td->directory);
+				return 1;
+			}
 			len = sprintf(tmp, "%s/", td->directory);
+		}
 
 		td->files = malloc(sizeof(struct fio_file) * td->nr_files);
 
@@ -700,9 +764,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		
 	fio_sem_init(&td->mutex, 0);
 
-	td->clat_stat[0].min_val = td->clat_stat[1].min_val = ULONG_MAX;
-	td->slat_stat[0].min_val = td->slat_stat[1].min_val = ULONG_MAX;
-	td->bw_stat[0].min_val = td->bw_stat[1].min_val = ULONG_MAX;
+	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;
 
 	if (td->stonewall && td->thread_number > 1)
 		groupid++;
@@ -713,11 +777,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		goto err;
 
 	if (td->write_lat_log) {
-		setup_log(&td->slat_log);
-		setup_log(&td->clat_log);
+		setup_log(&td->ts.slat_log);
+		setup_log(&td->ts.clat_log);
 	}
 	if (td->write_bw_log)
-		setup_log(&td->bw_log);
+		setup_log(&td->ts.bw_log);
 
 	if (!td->name)
 		td->name = strdup(jobname);
@@ -736,7 +800,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 				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);
+				fprintf(f_out, "%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth);
 
 				free(c1);
 				free(c2);
@@ -806,11 +870,11 @@ int init_random_state(struct thread_data *td)
 		return 0;
 
 	if (td->rand_repeatable)
-		seeds[3] = FIO_RANDSEED;
+		seeds[3] = FIO_RANDSEED * td->thread_number;
 
 	if (!td->norandommap) {
 		for_each_file(td, f, i) {
-			blocks = (f->file_size + td->rw_min_bs - 1) / td->rw_min_bs;
+			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));
 			f->num_maps = num_maps;
@@ -843,6 +907,8 @@ static int is_empty_or_comment(char *line)
 	for (i = 0; i < strlen(line); i++) {
 		if (line[i] == ';')
 			return 1;
+		if (line[i] == '#')
+			return 1;
 		if (!isspace(line[i]) && !iscntrl(line[i]))
 			return 0;
 	}
@@ -1316,6 +1382,8 @@ int parse_options(int argc, char *argv[])
 	f_out = stdout;
 	f_err = stderr;
 
+	options_init(options);
+
 	dupe_job_options();
 
 	if (setup_thread_area())