X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=e1b35ea499934054b1149b77795ddadbf5577067;hb=d3aad8f28b9e214fccfce5e3a406dec723f57a62;hp=3b902a8da940ce20346a6e1d3a13c072735767b7;hpb=af52b3455ad892322aab2791282b6bd4efdfdbf3;p=fio.git

diff --git a/fio.h b/fio.h
index 3b902a8d..e1b35ea4 100644
--- a/fio.h
+++ b/fio.h
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <getopt.h>
 
 #include "list.h"
 #include "md5.h"
@@ -218,6 +219,13 @@ enum fio_ioengine_flags {
 	FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
 };
 
+enum fio_file_flags {
+	FIO_FILE_OPEN		= 1 << 0,	/* file is open */
+	FIO_FILE_UNLINK		= 1 << 1,	/* unlink on close */
+	FIO_FILE_CLOSING	= 1 << 2,	/* file being closed */
+	FIO_FILE_EXISTS		= 1 << 3,	/* no need to create */
+};
+
 /*
  * Each thread_data structure has a number of files associated with it,
  * this structure holds state information for a single file.
@@ -232,7 +240,7 @@ struct fio_file {
 		unsigned long file_data;
 		int fd;
 	};
-	const char *file_name;
+	char *file_name;
 	void *mmap;
 	unsigned long long file_size;
 	unsigned long long real_file_size;
@@ -247,8 +255,8 @@ struct fio_file {
 	unsigned int num_maps;
 	unsigned int last_free_lookup;
 
-	unsigned int unlink;
-	unsigned int open;
+	int references;
+	enum fio_file_flags flags;
 };
 
 /*
@@ -317,9 +325,10 @@ struct thread_data {
 	int groupid;
 	struct thread_stat ts;
 	struct fio_file *files;
+	unsigned int files_index;
 	unsigned int nr_files;
 	unsigned int nr_open_files;
-	unsigned int nr_uniq_files;
+	unsigned int nr_normal_files;
 	union {
 		unsigned int next_file;
 		os_random_state_t next_file_state;
@@ -350,6 +359,7 @@ struct thread_data {
 	unsigned int write_bw_log;
 	unsigned int norandommap;
 	unsigned int bs_unaligned;
+	unsigned int fsync_on_close;
 
 	unsigned int bs[2];
 	unsigned int min_bs[2];
@@ -385,6 +395,7 @@ struct thread_data {
 	unsigned int file_service_type;
 	unsigned int group_reporting;
 	unsigned int open_files;
+	char *opendir;
 
 	char *read_iolog_file;
 	char *write_iolog_file;
@@ -420,9 +431,12 @@ struct thread_data {
 	unsigned int rate;
 	unsigned int ratemin;
 	unsigned int ratecycle;
+	unsigned int rate_iops;
+	unsigned int rate_iops_min;
 	unsigned long rate_usec_cycle;
 	long rate_pending_usleep;
 	unsigned long rate_bytes;
+	unsigned long rate_blocks;
 	struct timeval lastrate;
 
 	unsigned long long io_size;
@@ -482,6 +496,13 @@ struct thread_data {
 	unsigned int file_service_nr;
 	unsigned int file_service_left;
 	struct fio_file *file_service_file;
+
+	/*
+	 * For generating file sizes
+	 */
+	os_random_state_t file_size_state;
+	unsigned long long file_size_low;
+	unsigned long long file_size_high;
 };
 
 /*
@@ -524,6 +545,7 @@ extern FILE *f_out;
 extern FILE *f_err;
 extern int temp_stall_ts;
 extern unsigned long long mlock_size;
+extern unsigned long page_mask, page_size;
 
 extern struct thread_data *threads;
 
@@ -613,7 +635,6 @@ extern void disk_util_timer_arm(void);
 extern void setup_log(struct io_log **);
 extern void finish_log(struct thread_data *, struct io_log *, const char *);
 extern void __finish_log(struct io_log *, const char *);
-extern int setup_rate(struct thread_data *);
 extern struct io_log *agg_io_log[2];
 extern int write_bw_log;
 extern void add_agg_sample(unsigned long, enum fio_ddir);
@@ -635,10 +656,16 @@ extern void fio_gettime(struct timeval *, void *);
 extern void set_genesis_time(void);
 
 /*
- * Init functions
+ * Init/option functions
  */
 extern int __must_check parse_options(int, char **);
-extern int __must_check init_random_state(struct thread_data *);
+extern int fio_option_parse(struct thread_data *, const char *);
+extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
+extern void fio_fill_default_options(struct thread_data *);
+extern int fio_show_option_help(const char *);
+extern void fio_options_dup_and_init(struct option *);
+#define FIO_GETOPT_JOB		0x89988998
+#define FIO_NR_OPTIONS		128
 
 /*
  * File setup/shutdown
@@ -650,6 +677,9 @@ extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_f
 extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
 extern void generic_close_file(struct thread_data *, struct fio_file *);
 extern void add_file(struct thread_data *, const char *);
+extern void get_file(struct fio_file *);
+extern void put_file(struct thread_data *, struct fio_file *);
+extern int add_dir_files(struct thread_data *, const char *);
 
 /*
  * ETA/status stuff
@@ -726,6 +756,8 @@ extern void td_io_close_file(struct thread_data *, struct fio_file *);
 		fprintf(stderr, ##args);	\
 	} while (0)
 
+#define log_info(args...)	fprintf(f_out, ##args)
+
 FILE *get_f_out(void);
 FILE *get_f_err(void);
 
@@ -766,7 +798,7 @@ extern void close_ioengine(struct thread_data *);
 #define for_each_td(td, i)	\
 	for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)	\
-	for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++)
+	for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->nr_files; (i)++, (f)++)
 
 #define fio_assert(td, cond)	do {	\
 	if (!(cond)) {			\