X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=thread_options.h;h=a5d06aad5a80aaceb848fa2b46eaf3013ec15712;hb=b0df7176176935b4d39fd196ad35f046bbe10333;hp=d46da31b706e31dbd7a131ec2da372e4a060ce10;hpb=2dc1cbb52f73303d479a72e99930a2838c4b0fa4;p=fio.git

diff --git a/thread_options.h b/thread_options.h
index d46da31b..a5d06aad 100644
--- a/thread_options.h
+++ b/thread_options.h
@@ -43,6 +43,7 @@ struct thread_options {
 	char *filename;
 	char *opendir;
 	char *ioengine;
+	char *mmapfile;
 	enum td_ddir td_ddir;
 	unsigned int rw_seq;
 	unsigned int kb_base;
@@ -98,9 +99,6 @@ struct thread_options {
 	unsigned int override_sync;
 	unsigned int rand_repeatable;
 	unsigned int use_os_rand;
-	unsigned int write_lat_log;
-	unsigned int write_bw_log;
-	unsigned int write_iops_log;
 	unsigned int log_avg_msec;
 	unsigned int norandommap;
 	unsigned int softrandommap;
@@ -125,6 +123,7 @@ struct thread_options {
 	unsigned long long zone_range;
 	unsigned long long zone_size;
 	unsigned long long zone_skip;
+	unsigned long long lockmem;
 	enum fio_memtype mem_type;
 	unsigned int mem_align;
 
@@ -139,6 +138,8 @@ struct thread_options {
 	unsigned int rwmixcycle;
 	unsigned int rwmix[2];
 	unsigned int nice;
+	unsigned int ioprio;
+	unsigned int ioprio_class;
 	unsigned int file_service_type;
 	unsigned int group_reporting;
 	unsigned int fadvise_hint;
@@ -146,6 +147,8 @@ struct thread_options {
 	unsigned int zero_buffers;
 	unsigned int refill_buffers;
 	unsigned int scramble_buffers;
+	unsigned int compress_percentage;
+	unsigned int compress_chunk;
 	unsigned int time_based;
 	unsigned int disable_lat;
 	unsigned int disable_clat;
@@ -185,12 +188,6 @@ struct thread_options {
 
 	char *ioscheduler;
 
-	/*
-	 * CPU "io" cycle burner
-	 */
-	unsigned int cpuload;
-	unsigned int cpucycle;
-
 	/*
 	 * I/O Error handling
 	 */
@@ -216,6 +213,8 @@ struct thread_options {
 	int flow_watermark;
 	unsigned int flow_sleep;
 
+	unsigned long long offset_increment;
+
 	unsigned int sync_file_range;
 };
 
@@ -228,6 +227,7 @@ struct thread_options_pack {
 	uint8_t filename[FIO_TOP_STR_MAX];
 	uint8_t opendir[FIO_TOP_STR_MAX];
 	uint8_t ioengine[FIO_TOP_STR_MAX];
+	uint8_t mmapfile[FIO_TOP_STR_MAX];
 	uint32_t td_ddir;
 	uint32_t rw_seq;
 	uint32_t kb_base;
@@ -283,9 +283,6 @@ struct thread_options_pack {
 	uint32_t override_sync;
 	uint32_t rand_repeatable;
 	uint32_t use_os_rand;
-	uint32_t write_lat_log;
-	uint32_t write_bw_log;
-	uint32_t write_iops_log;
 	uint32_t log_avg_msec;
 	uint32_t norandommap;
 	uint32_t softrandommap;
@@ -310,6 +307,7 @@ struct thread_options_pack {
 	uint64_t zone_range;
 	uint64_t zone_size;
 	uint64_t zone_skip;
+	uint64_t lockmem;
 	uint32_t mem_type;
 	uint32_t mem_align;
 
@@ -324,6 +322,8 @@ struct thread_options_pack {
 	uint32_t rwmixcycle;
 	uint32_t rwmix[2];
 	uint32_t nice;
+	uint32_t ioprio;
+	uint32_t ioprio_class;
 	uint32_t file_service_type;
 	uint32_t group_reporting;
 	uint32_t fadvise_hint;
@@ -331,6 +331,8 @@ struct thread_options_pack {
 	uint32_t zero_buffers;
 	uint32_t refill_buffers;
 	uint32_t scramble_buffers;
+	unsigned int compress_percentage;
+	unsigned int compress_chunk;
 	uint32_t time_based;
 	uint32_t disable_lat;
 	uint32_t disable_clat;
@@ -370,12 +372,6 @@ struct thread_options_pack {
 
 	uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
-	/*
-	 * CPU "io" cycle burner
-	 */
-	uint32_t cpuload;
-	uint32_t cpucycle;
-
 	/*
 	 * I/O Error handling
 	 */
@@ -401,10 +397,14 @@ struct thread_options_pack {
 	int32_t flow_watermark;
 	uint32_t flow_sleep;
 
+	uint64_t offset_increment;
+
 	uint32_t sync_file_range;
 } __attribute__((packed));
 
 extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);
 extern void convert_thread_options_to_net(struct thread_options_pack *top, struct thread_options *);
+extern int fio_test_cconv(struct thread_options *);
+extern void options_default_fill(struct thread_options *o);
 
 #endif