X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=05911c00d1934f6368b5d7e28942a9deaae278a4;hp=b1af7b1bb8935ddfe1ac384f844a91f6c14e7eb5;hb=7c639b1495d2776afbf66f91accff1e6000aa8f0;hpb=6adb38a1a1cbe95f7131815416c8bb31683c3f47

diff --git a/fio.h b/fio.h
index b1af7b1b..05911c00 100644
--- a/fio.h
+++ b/fio.h
@@ -28,8 +28,9 @@
 #include "io_ddir.h"
 #include "ioengine.h"
 #include "iolog.h"
-#include "profiles.h"
 #include "helpers.h"
+#include "options.h"
+#include "profile.h"
 
 #ifdef FIO_HAVE_GUASI
 #include <guasi.h>
@@ -227,6 +228,7 @@ struct thread_options {
 	unsigned int file_service_type;
 	unsigned int group_reporting;
 	unsigned int fadvise_hint;
+	unsigned int fallocate;
 	unsigned int zero_buffers;
 	unsigned int refill_buffers;
 	unsigned int time_based;
@@ -270,13 +272,18 @@ struct thread_options {
 	/*
 	 * Benchmark profile type
 	 */
-	unsigned int profile;
+	char *profile;
 
 	/*
 	 * blkio cgroup support
 	 */
 	char *cgroup;
 	unsigned int cgroup_weight;
+
+	unsigned int uid;
+	unsigned int gid;
+
+	unsigned int sync_file_range;
 };
 
 #define FIO_VERROR_SIZE	128
@@ -356,7 +363,7 @@ struct thread_data {
 	/*
 	 * Rate state
 	 */
-	unsigned long rate_usec_cycle[2];
+	unsigned long rate_nsec_cycle[2];
 	long rate_pending_usleep[2];
 	unsigned long rate_bytes[2];
 	unsigned long rate_blocks[2];
@@ -412,6 +419,8 @@ struct thread_data {
 	unsigned int file_service_left;
 	struct fio_file *file_service_file;
 
+	unsigned int sync_file_range_nr;
+
 	/*
 	 * For generating file sizes
 	 */
@@ -422,6 +431,12 @@ struct thread_data {
 	 */
 	unsigned int total_err_count;
 	int first_error;
+
+	/*
+	 * Can be overloaded by profiles
+	 */
+	struct prof_io_ops prof_io_ops;
+	void *prof_data;
 };
 
 /*
@@ -534,8 +549,9 @@ extern void fio_options_dup_and_init(struct option *);
 extern void options_mem_dupe(struct thread_data *);
 extern void options_mem_free(struct thread_data *);
 extern void td_fill_rand_seeds(struct thread_data *);
+extern void add_job_opts(const char **);
 #define FIO_GETOPT_JOB		0x89988998
-#define FIO_NR_OPTIONS		128
+#define FIO_NR_OPTIONS		(FIO_MAX_OPTS + 128)
 
 /*
  * ETA/status stuff