X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=e85d6cc1f0ac2011fb79780adb838039cd8b56a0;hp=16d5523feb6bf2af4f5f3684010645ceae95ccec;hb=d56cbab065c01e1a177bc1b8d85a8f5d78df1548;hpb=1e97cce9f5a87a67293a05ec4533ed6968698b2e

diff --git a/fio.h b/fio.h
index 16d5523f..e85d6cc1 100644
--- a/fio.h
+++ b/fio.h
@@ -25,11 +25,12 @@ enum fio_ddir {
 };
 
 struct io_stat {
-	unsigned long val;
-	unsigned long val_sq;
 	unsigned long max_val;
 	unsigned long min_val;
 	unsigned long samples;
+
+	double mean;
+	double S;
 };
 
 struct io_sample {
@@ -123,7 +124,9 @@ struct group_run_stats {
 enum fio_memtype {
 	MEM_MALLOC = 0,	/* ordinary malloc */
 	MEM_SHM,	/* use shared memory segments */
+	MEM_SHMHUGE,	/* use shared memory segments with huge pages */
 	MEM_MMAP,	/* use anonynomous mmap */
+	MEM_MMAPHUGE,	/* memory mapped huge file */
 };
 
 /*
@@ -160,6 +163,8 @@ struct fio_file {
 
 	unsigned long *file_map;
 	unsigned int num_maps;
+
+	unsigned int unlink;
 };
 
 /*
@@ -210,8 +215,10 @@ struct thread_data {
 	unsigned int bs[2];
 	unsigned int min_bs[2];
 	unsigned int max_bs[2];
+	unsigned int hugepage_size;
 	unsigned int rw_min_bs;
 	unsigned int thinktime;
+	unsigned int thinktime_blocks;
 	unsigned int fsync_blocks;
 	unsigned int start_delay;
 	unsigned long timeout;
@@ -221,6 +228,8 @@ struct thread_data {
 	unsigned long long zone_size;
 	unsigned long long zone_skip;
 	enum fio_memtype mem_type;
+	char *mmapfile;
+	int mmapfd;
 	unsigned int stonewall;
 	unsigned int numjobs;
 	unsigned int iodepth;