X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=557382b6a1b8c2e25c4ff42aaf1ab85a1c0ff0fa;hp=5630c9fb3e821708b6bb8552cd5a3111834c82fb;hb=b1ec1da670aab645e32303ea5ffaa1e5ca336936;hpb=e916b390684ec1ca6247f98138fa9c1682701d29

diff --git a/init.c b/init.c
index 5630c9fb..557382b6 100644
--- a/init.c
+++ b/init.c
@@ -22,10 +22,8 @@
 
 #define td_var_offset(var)	((size_t) &((struct thread_data *)0)->var)
 
-static int str_rw_cb(void *, const char *);
 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 *);
@@ -68,11 +66,17 @@ static struct fio_option options[] = {
 	{
 		.name	= "rw",
 		.type	= FIO_OPT_STR,
-		.cb	= str_rw_cb,
+		.off1	= td_var_offset(td_ddir),
 		.help	= "IO direction",
 		.def	= "read",
-		.posval	= { "read", "write", "randwrite", "randread", "rw",
-				"randrw", },
+		.posval = {
+			  { .ival = "read", .oval = TD_DDIR_READ },
+			  { .ival = "write", .oval = TD_DDIR_WRITE },
+			  { .ival = "randread", .oval = TD_DDIR_RANDREAD },
+			  { .ival = "randwrite", .oval = TD_DDIR_RANDWRITE },
+			  { .ival = "rw", .oval = TD_DDIR_RW },
+			  { .ival = "randrw", .oval = TD_DDIR_RANDRW },
+			  },
 	},
 	{
 		.name	= "ioengine",
@@ -80,8 +84,13 @@ static struct fio_option options[] = {
 		.cb	= str_ioengine_cb,
 		.help	= "IO engine to use",
 		.def	= "sync",
-		.posval	= { "sync", "libaio", "posixaio", "mmap", "splice",
-				"sg", "null", "net", "syslet-rw" },
+		.posval	= {
+			  { .ival = "sync", }, { .ival = "libaio", },
+			  { .ival = "posixaio", }, { .ival = "mmap", },
+			  { .ival = "splice", }, { .ival = "sg", },
+			  { .ival = "null", }, { .ival = "net", },
+			  { .ival = "syslet-rw", },
+			  },
 	},
 	{
 		.name	= "iodepth",
@@ -152,6 +161,17 @@ static struct fio_option options[] = {
 		.help	= "Split job workload between this number of files",
 		.def	= "1",
 	},
+	{
+		.name	= "file_service_type",
+		.type	= FIO_OPT_STR,
+		.off1	= td_var_offset(file_service_type),
+		.help	= "How to select which file to service next",
+		.def	= "roundrobin",
+		.posval	= {
+			  { .ival = "random", .oval = FIO_FSERVICE_RANDOM },
+			  { .ival = "roundrobin", .oval = FIO_FSERVICE_RR },
+			  },
+	},
 	{
 		.name	= "fsync",
 		.type	= FIO_OPT_INT,
@@ -214,17 +234,32 @@ static struct fio_option options[] = {
 		.name	= "mem",
 		.type	= FIO_OPT_STR,
 		.cb	= str_mem_cb,
+		.off1	= td_var_offset(mem_type),
 		.help	= "Backing type for IO buffers",
 		.def	= "malloc",
-		.posval	=  { "malloc", "shm", "shmhuge", "mmap", "mmaphuge", },
+		.posval	= {
+			  { .ival = "malloc", .oval = MEM_MALLOC },
+			  { .ival = "shm", .oval = MEM_SHM },
+#ifdef FIO_HAVE_HUGETLB
+			  { .ival = "shmhuge", .oval = MEM_SHMHUGE },
+#endif
+			  { .ival = "mmap", .oval = MEM_MMAP },
+#ifdef FIO_HAVE_HUGETLB
+			  { .ival = "mmaphuge", .oval = MEM_MMAPHUGE },
+#endif
+			  },
 	},
 	{
 		.name	= "verify",
 		.type	= FIO_OPT_STR,
-		.cb	= str_verify_cb,
+		.off1	= td_var_offset(verify),
 		.help	= "Verify sum function",
 		.def	= "0",
-		.posval	= { "crc32", "md5", },
+		.posval = {
+			  { .ival = "0", .oval = VERIFY_NONE },
+			  { .ival = "crc32", .oval = VERIFY_CRC32 },
+			  { .ival = "md5", .oval = VERIFY_MD5 },
+			  },
 	},
 	{
 		.name	= "write_iolog",
@@ -609,7 +644,7 @@ static void fixup_options(struct thread_data *td)
 	/*
 	 * only really works for sequential io for now, and with 1 file
 	 */
-	if (td->zone_size && !td->sequential && td->nr_files == 1)
+	if (td->zone_size && td_random(td) && td->nr_files == 1)
 		td->zone_size = 0;
 
 	/*
@@ -656,8 +691,6 @@ static void fixup_options(struct thread_data *td)
 	 */
 	if (td->iodepth_low > td->iodepth || !td->iodepth_low)
 		td->iodepth_low = td->iodepth;
-
-	printf("io depth %d/%d\n", td->iodepth_low, td->iodepth);
 }
 
 /*
@@ -688,10 +721,10 @@ static char *to_kmg(unsigned int val)
  */
 static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
-	const char *ddir_str[] = { "read", "write", "randread", "randwrite",
-				   "rw", NULL, "randrw" };
+	const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
+				   "randread", "randwrite", "randrw" };
 	struct stat sb;
-	int numjobs, ddir, i;
+	int numjobs, i;
 	struct fio_file *f;
 
 	/*
@@ -727,7 +760,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		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);
+				td_verror(td, errno, "lstat");
 				return 1;
 			}
 			if (!S_ISDIR(sb.st_mode)) {
@@ -788,8 +821,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	if (!td->name)
 		td->name = strdup(jobname);
 
-	ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
-
 	if (!terse_output) {
 		if (!job_add_num) {
 			if (td->io_ops->flags & FIO_CPUIO)
@@ -802,7 +833,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, 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);
+				fprintf(f_out, "%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);
 
 				free(c1);
 				free(c2);
@@ -843,7 +874,7 @@ err:
  */
 int init_random_state(struct thread_data *td)
 {
-	unsigned long seeds[4];
+	unsigned long seeds[5];
 	int fd, num_maps, blocks, i;
 	struct fio_file *f;
 
@@ -852,12 +883,12 @@ int init_random_state(struct thread_data *td)
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
-		td_verror(td, errno);
+		td_verror(td, errno, "open");
 		return 1;
 	}
 
 	if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
-		td_verror(td, EIO);
+		td_verror(td, EIO, "read");
 		close(fd);
 		return 1;
 	}
@@ -868,11 +899,14 @@ 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->sequential)
+	if (td->file_service_type == FIO_FSERVICE_RANDOM)
+		os_random_seed(seeds[3], &td->next_file_state);
+
+	if (!td_random(td))
 		return 0;
 
 	if (td->rand_repeatable)
-		seeds[3] = FIO_RANDSEED * td->thread_number;
+		seeds[4] = FIO_RANDSEED * td->thread_number;
 
 	if (!td->norandommap) {
 		for_each_file(td, f, i) {
@@ -884,7 +918,7 @@ int init_random_state(struct thread_data *td)
 		}
 	}
 
-	os_random_seed(seeds[3], &td->random_state);
+	os_random_seed(seeds[4], &td->random_state);
 	return 0;
 }
 
@@ -918,61 +952,6 @@ static int is_empty_or_comment(char *line)
 	return 1;
 }
 
-static int str_rw_cb(void *data, const char *mem)
-{
-	struct thread_data *td = data;
-
-	if (!strncmp(mem, "read", 4) || !strncmp(mem, "0", 1)) {
-		td->ddir = DDIR_READ;
-		td->sequential = 1;
-		return 0;
-	} else if (!strncmp(mem, "randread", 8)) {
-		td->ddir = DDIR_READ;
-		td->sequential = 0;
-		return 0;
-	} else if (!strncmp(mem, "write", 5) || !strncmp(mem, "1", 1)) {
-		td->ddir = DDIR_WRITE;
-		td->sequential = 1;
-		return 0;
-	} else if (!strncmp(mem, "randwrite", 9)) {
-		td->ddir = DDIR_WRITE;
-		td->sequential = 0;
-		return 0;
-	} else if (!strncmp(mem, "rw", 2)) {
-		td->ddir = DDIR_READ;
-		td->iomix = 1;
-		td->sequential = 1;
-		return 0;
-	} else if (!strncmp(mem, "randrw", 6)) {
-		td->ddir = DDIR_READ;
-		td->iomix = 1;
-		td->sequential = 0;
-		return 0;
-	}
-
-	log_err("fio: data direction: read, write, randread, randwrite, rw, randrw\n");
-	return 1;
-}
-
-static int str_verify_cb(void *data, const char *mem)
-{
-	struct thread_data *td = data;
-
-	if (!strncmp(mem, "0", 1)) {
-		td->verify = VERIFY_NONE;
-		return 0;
-	} else if (!strncmp(mem, "md5", 3) || !strncmp(mem, "1", 1)) {
-		td->verify = VERIFY_MD5;
-		return 0;
-	} else if (!strncmp(mem, "crc32", 5)) {
-		td->verify = VERIFY_CRC32;
-		return 0;
-	}
-
-	log_err("fio: verify types: md5, crc32\n");
-	return 1;
-}
-
 /*
  * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
  */
@@ -993,49 +972,15 @@ static int str_mem_cb(void *data, const char *mem)
 {
 	struct thread_data *td = data;
 
-	if (!strncmp(mem, "malloc", 6)) {
-		td->mem_type = MEM_MALLOC;
-		return 0;
-	} else if (!strncmp(mem, "mmaphuge", 8)) {
-#ifdef FIO_HAVE_HUGETLB
-		/*
-		 * mmaphuge must be appended with the actual file
-		 */
+	if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
 		td->mmapfile = get_mmap_file(mem);
-		if (!td->mmapfile) {
+		if (td->mem_type == MEM_MMAPHUGE && !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, shmhuge, mmap, mmaphuge\n");
-	return 1;
+	return 0;
 }
 
 static int str_ioengine_cb(void *data, const char *str)
@@ -1046,7 +991,7 @@ static int str_ioengine_cb(void *data, const char *str)
 	if (td->io_ops)
 		return 0;
 
-	log_err("fio: ioengine= libaio, posixaio, sync, mmap, sgio, splice, cpu, null\n");
+	log_err("fio: ioengine= libaio, posixaio, sync, syslet-rw, mmap, sgio, splice, cpu, null\n");
 	log_err("fio: or specify path to dynamic ioengine module\n");
 	return 1;
 }
@@ -1218,7 +1163,7 @@ static void usage(void)
 static int parse_cmd_line(int argc, char *argv[])
 {
 	struct thread_data *td = NULL;
-	int c, ini_idx = 0, lidx, ret;
+	int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
 
 	while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) {
 		switch (c) {
@@ -1273,9 +1218,8 @@ static int parse_cmd_line(int argc, char *argv[])
 
 			ret = parse_cmd_option(opt, val, options, td);
 			if (ret) {
+				dont_add_job = 1;
 				log_err("fio: job dropped\n");
-				put_job(td);
-				td = NULL;
 			}
 			break;
 		}
@@ -1285,9 +1229,13 @@ static int parse_cmd_line(int argc, char *argv[])
 	}
 
 	if (td) {
-		ret = add_job(td, td->name ?: "fio", 0);
-		if (ret)
+		if (dont_add_job)
 			put_job(td);
+		else {
+			ret = add_job(td, td->name ?: "fio", 0);
+			if (ret)
+				put_job(td);
+		}
 	}
 
 	while (optind < argc) {