X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=bb47c439c92984caf011633b0894ac9bdbd2a665;hp=bfe698106b3bf02fe529990c19aa204267ef273b;hb=8aeebd5570ac4fccbcdd48f2e6f1cf1577f3c08d;hpb=74b025b071b5bfbffa7ad7682b66b749e8d1f955;ds=sidebyside

diff --git a/init.c b/init.c
index bfe69810..bb47c439 100644
--- a/init.c
+++ b/init.c
@@ -52,6 +52,8 @@
 #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)
 
@@ -224,87 +226,92 @@ static struct fio_option options[] = {
 	{
 		.name	= "thinktime",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(thinktime)
+		.off1	= td_var_offset(thinktime),
+	},
+	{
+		.name	= "thinktime_blocks",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(thinktime_blocks),
 	},
 	{
 		.name	= "rate",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rate)
+		.off1	= td_var_offset(rate),
 	},
 	{
 		.name	= "ratemin",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(ratemin)
+		.off1	= td_var_offset(ratemin),
 	},
 	{
 		.name	= "ratecycle",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(ratecycle)
+		.off1	= td_var_offset(ratecycle),
 	},
 	{
 		.name	= "startdelay",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(start_delay)
+		.off1	= td_var_offset(start_delay),
 	},
 	{
 		.name	= "timeout",
 		.type	= FIO_OPT_STR_VAL_TIME,
-		.off1	= td_var_offset(timeout)
+		.off1	= td_var_offset(timeout),
 	},
 	{
 		.name	= "invalidate",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(invalidate_cache)
+		.off1	= td_var_offset(invalidate_cache),
 	},
 	{
 		.name	= "sync",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(sync_io)
+		.off1	= td_var_offset(sync_io),
 	},
 	{
 		.name	= "bwavgtime",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(bw_avg_time)
+		.off1	= td_var_offset(bw_avg_time),
 	},
 	{
 		.name	= "create_serialize",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(create_serialize)
+		.off1	= td_var_offset(create_serialize),
 	},
 	{
 		.name	= "create_fsync",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(create_fsync)
+		.off1	= td_var_offset(create_fsync),
 	},
 	{
 		.name	= "loops",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(loops)
+		.off1	= td_var_offset(loops),
 	},
 	{
 		.name	= "numjobs",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(numjobs)
+		.off1	= td_var_offset(numjobs),
 	},
 	{
 		.name	= "cpuload",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(cpuload)
+		.off1	= td_var_offset(cpuload),
 	},
 	{
 		.name	= "cpuchunks",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(cpucycle)
+		.off1	= td_var_offset(cpucycle),
 	},
 	{
 		.name	= "direct",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(odirect)
+		.off1	= td_var_offset(odirect),
 	},
 	{
 		.name	= "overwrite",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(overwrite)
+		.off1	= td_var_offset(overwrite),
 	},
 #ifdef FIO_HAVE_CPU_AFFINITY
 	{
@@ -316,11 +323,11 @@ static struct fio_option options[] = {
 	{
 		.name	= "end_fsync",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(end_fsync)
+		.off1	= td_var_offset(end_fsync),
 	},
 	{
 		.name	= "unlink",
-		.type	= FIO_OPT_STR_SET,
+		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(unlink),
 	},
 	{
@@ -358,6 +365,11 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(bs_unaligned),
 	},
+	{
+		.name	= "hugepage-size",
+		.type	= FIO_OPT_STR_VAL,
+		.off1	= td_var_offset(hugepage_size),
+	},
 	{
 		.name = NULL,
 	},
@@ -409,7 +421,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.9";
+static char fio_version_string[] = "fio 1.10";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -508,6 +520,12 @@ 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;
 }
 
 /*
@@ -564,8 +582,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))
@@ -574,6 +590,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
@@ -584,7 +602,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		int len = 0;
 
 		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);
 
@@ -597,6 +615,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 			else
 				sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
 			f->file_name = strdup(tmp);
+			fprintf(stderr, "%s\n", f->file_name);
 		}
 	} else {
 		td->nr_files = 1;
@@ -820,6 +839,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,10 +862,29 @@ 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)) {
@@ -841,9 +895,12 @@ static int str_mem_cb(void *data, const char *mem)
 		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, shmhuge\n");
+	log_err("fio: mem type: malloc, shm, shmhuge, mmap, mmaphuge\n");
 	return 1;
 }
 
@@ -1029,6 +1086,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
@@ -1109,7 +1168,6 @@ static int parse_cmd_line(int argc, char *argv[])
 			break;
 		}
 		default:
-			printf("optarg <<%s>>\n", argv[optind]);
 			break;
 		}
 	}