X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=a6adcb7bbc5b27cc00004e4a2949fcef13cb90f6;hp=7db30909e563a3b51ab683bcd9ce9016e5001485;hb=a998c869545503e733f4ff0f2bf6fc1e2dceec6c;hpb=ebb1415f729c123b8a13bcbd667bf4b4cc95b4d4

diff --git a/fio.h b/fio.h
index 7db30909..a6adcb7b 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"
@@ -222,6 +223,7 @@ 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 */
 };
 
 /*
@@ -393,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;
@@ -428,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;
@@ -490,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;
 };
 
 /*
@@ -532,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;
 
@@ -643,10 +657,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
@@ -660,6 +680,7 @@ 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
@@ -736,6 +757,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);