X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=9471666b02b45cf7328637841e249636247f06c1;hp=112736c81a360b265bd25c26820734f743ee34eb;hb=263e529f7d90892a610a5b26a519116fe3a675a6;hpb=c1d5725eaad49dbf5b3a05c27b0b3677af69f64c

diff --git a/fio.h b/fio.h
index 112736c8..9471666b 100644
--- a/fio.h
+++ b/fio.h
@@ -39,6 +39,7 @@ struct io_log {
 
 struct io_piece {
 	struct list_head list;
+	struct fio_file *file;
 	unsigned long long offset;
 	unsigned int len;
 	int ddir;
@@ -73,6 +74,8 @@ struct io_u {
 	unsigned char seen;
 	unsigned char ddir;
 
+	struct fio_file *file;
+
 	struct list_head list;
 };
 
@@ -128,6 +131,28 @@ enum fio_ioengine_flags {
 	FIO_SYNCIO	= 1 << 0,
 	FIO_CPUIO	= 1 << 1,
 	FIO_MMAPIO	= 1 << 2,
+	FIO_RAWIO	= 1 << 3,
+};
+
+struct fio_file {
+	/*
+	 * A file may not be a file descriptor, let the io engine decide
+	 */
+	union {
+		unsigned long file_data;
+		int fd;
+	};
+	char *file_name;
+	void *mmap;
+	unsigned long long file_size;
+	unsigned long long real_file_size;
+	unsigned long long file_offset;
+	unsigned long long last_pos;
+
+	unsigned long *file_map;
+	unsigned int num_maps;
+
+	int fileno;
 };
 
 /*
@@ -135,16 +160,16 @@ enum fio_ioengine_flags {
  */
 struct thread_data {
 	char name[32];
-	char *file_name;
 	char *directory;
 	char verror[80];
 	pthread_t thread;
 	int thread_number;
 	int groupid;
 	enum fio_filetype filetype;
+	struct fio_file *files;
+	unsigned int nr_files;
+	unsigned int next_file;
 	int error;
-	int fd;
-	void *mmap;
 	pid_t pid;
 	char *orig_buffer;
 	size_t orig_buffer_size;
@@ -164,6 +189,7 @@ struct thread_data {
 	unsigned char sync_io;
 	unsigned char verify;
 	unsigned char use_thread;
+	unsigned char unlink;
 	unsigned char do_disk_util;
 	unsigned char override_sync;
 	unsigned char rand_repeatable;
@@ -178,9 +204,6 @@ struct thread_data {
 	unsigned int overwrite;
 	unsigned int bw_avg_time;
 	unsigned int loops;
-	unsigned long long file_size;
-	unsigned long long real_file_size;
-	unsigned long long file_offset;
 	unsigned long long zone_size;
 	unsigned long long zone_skip;
 	enum fio_memtype mem_type;
@@ -233,21 +256,20 @@ struct thread_data {
 
 	unsigned long runtime[2];		/* msec */
 	unsigned long long io_size;
+	unsigned long long total_file_size;
+	unsigned long long start_offset;
 	unsigned long long total_io_size;
 
 	unsigned long long io_blocks[2];
 	unsigned long long io_bytes[2];
 	unsigned long long zone_bytes;
 	unsigned long long this_io_bytes[2];
-	unsigned long long last_pos;
 	volatile int mutex;
 
 	/*
 	 * State for random io, a bitmap of blocks done vs not done
 	 */
 	os_random_state_t random_state;
-	unsigned long *file_map;
-	unsigned int num_maps;
 
 	/*
 	 * CPU "io" cycle burner
@@ -326,6 +348,7 @@ extern int terse_output;
 extern FILE *f_out;
 extern FILE *f_err;
 extern char *fio_inst_prefix;
+extern int temp_stall_ts;
 
 extern struct thread_data *threads;
 
@@ -334,9 +357,9 @@ extern struct thread_data *threads;
 #define td_rw(td)		((td)->iomix != 0)
 
 #define BLOCKS_PER_MAP		(8 * sizeof(long))
-#define TO_MAP_BLOCK(td, b)	((b) - ((td)->file_offset / (td)->min_bs))
-#define RAND_MAP_IDX(td, b)	(TO_MAP_BLOCK(td, b) / BLOCKS_PER_MAP)
-#define RAND_MAP_BIT(td, b)	(TO_MAP_BLOCK(td, b) & (BLOCKS_PER_MAP - 1))
+#define TO_MAP_BLOCK(td, f, b)	((b) - ((f)->file_offset / (td)->min_bs))
+#define RAND_MAP_IDX(td, f, b)	(TO_MAP_BLOCK(td, f, b) / BLOCKS_PER_MAP)
+#define RAND_MAP_BIT(td, f, b)	(TO_MAP_BLOCK(td, f, b) & (BLOCKS_PER_MAP - 1))
 
 #define MAX_JOBS	(1024)
 
@@ -404,10 +427,12 @@ extern int setup_rate(struct thread_data *);
 /*
  * Time functions
  */
+extern void time_init(void);
 extern unsigned long utime_since(struct timeval *, struct timeval *);
 extern unsigned long mtime_since(struct timeval *, struct timeval *);
 extern unsigned long mtime_since_now(struct timeval *);
 extern unsigned long time_since_now(struct timeval *);
+extern unsigned long mtime_since_genesis(void);
 extern void __usec_sleep(unsigned int);
 extern void usec_sleep(struct thread_data *, unsigned long);
 extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
@@ -418,6 +443,35 @@ extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
 extern int parse_options(int, char **);
 extern int init_random_state(struct thread_data *);
 
+/*
+ * File setup/shutdown
+ */
+extern void close_files(struct thread_data *);
+extern int setup_files(struct thread_data *);
+
+/*
+ * ETA/status stuff
+ */
+extern void print_thread_status(void);
+extern void print_status_init(int);
+
+/*
+ * Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it
+ * will never back again. It may cycle between running/verififying/fsyncing.
+ * Once the thread reaches TD_EXITED, it is just waiting for the core to
+ * reap it.
+ */
+enum {
+	TD_NOT_CREATED = 0,
+	TD_CREATED,
+	TD_INITIALIZED,
+	TD_RUNNING,
+	TD_VERIFYING,
+	TD_FSYNCING,
+	TD_EXITED,
+	TD_REAPED,
+};
+
 /*
  * This is a pretty crappy semaphore implementation, but with the use that fio
  * has (just signalling start/go conditions), it doesn't have to be better.
@@ -455,6 +509,7 @@ struct ioengine_ops {
 	char name[16];
 	int version;
 	int flags;
+	int (*setup)(struct thread_data *);
 	int (*init)(struct thread_data *);
 	int (*prep)(struct thread_data *, struct io_u *);
 	int (*queue)(struct thread_data *, struct io_u *);
@@ -462,12 +517,12 @@ struct ioengine_ops {
 	struct io_u *(*event)(struct thread_data *, int);
 	int (*cancel)(struct thread_data *, struct io_u *);
 	void (*cleanup)(struct thread_data *);
-	int (*sync)(struct thread_data *);
+	int (*sync)(struct thread_data *, struct fio_file *);
 	void *data;
 	void *dlhandle;
 };
 
-#define FIO_IOOPS_VERSION	1
+#define FIO_IOOPS_VERSION	2
 
 extern struct ioengine_ops *load_ioengine(struct thread_data *, char *);
 extern void close_ioengine(struct thread_data *);
@@ -477,4 +532,7 @@ extern void close_ioengine(struct thread_data *);
  */
 #define fio_unused	__attribute((__unused__))
 
+#define for_each_file(td, f, i)	\
+	for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->nr_files; (i)++, (f) = &(td)->files[(i)])
+
 #endif