X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=641ecdaf995d4e58d13f8567c1e572d5365e66bd;hp=57d1b6b995d28dee547e5c9dfeb4858a83e305de;hb=b5af82930ccfd7dda6a1b11794efb452eb76d8dc;hpb=5b38ee84f35c7cf3a3a804e6dbe3621f8980d3bb

diff --git a/fio.h b/fio.h
index 57d1b6b9..641ecdaf 100644
--- a/fio.h
+++ b/fio.h
@@ -34,7 +34,7 @@ enum td_ddir {
 	TD_DDIR_RAND		= 1 << 2,
 	TD_DDIR_RW		= TD_DDIR_READ | TD_DDIR_WRITE,
 	TD_DDIR_RANDREAD	= TD_DDIR_READ | TD_DDIR_RAND,
-	TD_DDIR_RANDWRITE	= TD_DDIR_WRITE | TD_DDIR_READ,
+	TD_DDIR_RANDWRITE	= TD_DDIR_WRITE | TD_DDIR_RAND,
 	TD_DDIR_RANDRW		= TD_DDIR_RW | TD_DDIR_RAND,
 };
 
@@ -212,10 +212,8 @@ enum fio_filetype {
 enum fio_ioengine_flags {
 	FIO_SYNCIO	= 1 << 0,	/* io engine has synchronous ->queue */
 	FIO_CPUIO	= 1 << 1,	/* cpu burner, doesn't do real io */
-	FIO_MMAPIO	= 1 << 2,	/* uses memory mapped io */
-	FIO_RAWIO	= 1 << 3,	/* some sort of direct/raw io */
-	FIO_NETIO	= 1 << 4,	/* networked io */
-	FIO_NULLIO	= 1 << 5,	/* no real data transfer (cpu/null) */
+	FIO_RAWIO	= 1 << 2,	/* some sort of direct/raw io */
+	FIO_DISKLESSIO	= 1 << 3,	/* no disk involved */
 };
 
 /*
@@ -248,7 +246,21 @@ struct fio_file {
 	unsigned int unlink;
 };
 
+/*
+ * How many depth levels to log
+ */
+#define FIO_IO_U_MAP_NR	8
+#define FIO_IO_U_LAT_NR 12
+
 struct thread_stat {
+	char *name;
+	char *verror;
+	int error;
+	int groupid;
+	pid_t pid;
+	char *description;
+	int members;
+
 	struct io_log *slat_log;
 	struct io_log *clat_log;
 	struct io_log *bw_log;
@@ -271,13 +283,18 @@ struct thread_stat {
 	unsigned long usr_time;
 	unsigned long sys_time;
 	unsigned long ctx;
-};
 
-/*
- * How many depth levels to log
- */
-#define FIO_IO_U_MAP_NR	8
-#define FIO_IO_U_LAT_NR 12
+	/*
+	 * IO depth and latency stats
+	 */
+	unsigned int io_u_map[FIO_IO_U_MAP_NR];
+	unsigned int io_u_lat[FIO_IO_U_LAT_NR];
+	unsigned long total_io_u;
+
+	unsigned long long io_bytes[2];
+	unsigned long runtime[2];
+	unsigned long total_run_time;
+};
 
 /*
  * This describes a single thread/process executing a fio job.
@@ -288,7 +305,7 @@ struct thread_data {
 	char *name;
 	char *directory;
 	char *filename;
-	char verror[80];
+	char verror[128];
 	pthread_t thread;
 	int thread_number;
 	int groupid;
@@ -296,6 +313,7 @@ struct thread_data {
 	enum fio_filetype filetype;
 	struct fio_file *files;
 	unsigned int nr_files;
+	unsigned int nr_open_files;
 	unsigned int nr_uniq_files;
 	union {
 		unsigned int next_file;
@@ -351,6 +369,7 @@ struct thread_data {
 	unsigned int numjobs;
 	unsigned int iodepth;
 	unsigned int iodepth_low;
+	unsigned int iodepth_batch;
 	os_cpu_mask_t cpumask;
 	unsigned int iolog;
 	unsigned int read_iolog;
@@ -359,6 +378,8 @@ struct thread_data {
 	unsigned int rwmixwrite;
 	unsigned int nice;
 	unsigned int file_service_type;
+	unsigned int group_reporting;
+	unsigned int open_files;
 
 	char *read_iolog_file;
 	char *write_iolog_file;
@@ -383,12 +404,10 @@ struct thread_data {
 	 * Current IO depth and list of free and busy io_u's.
 	 */
 	unsigned int cur_depth;
-	unsigned int io_u_map[FIO_IO_U_MAP_NR];
-	unsigned int io_u_lat[FIO_IO_U_LAT_NR];
-	unsigned long total_io_u;
 	struct list_head io_u_freelist;
 	struct list_head io_u_busylist;
 	struct list_head io_u_requeues;
+	unsigned int io_u_queued;
 
 	/*
 	 * Rate state
@@ -401,7 +420,6 @@ struct thread_data {
 	unsigned long rate_bytes;
 	struct timeval lastrate;
 
-	unsigned long runtime[2];		/* msec */
 	unsigned long long io_size;
 	unsigned long long total_file_size;
 	unsigned long long start_offset;
@@ -427,7 +445,6 @@ struct thread_data {
 
 	struct timeval start;	/* start of this loop */
 	struct timeval epoch;	/* time job was started */
-	struct timeval end_time;/* time job ended */
 
 	/*
 	 * read/write mixed workload state
@@ -616,7 +633,10 @@ extern int __must_check init_random_state(struct thread_data *);
 extern void close_files(struct thread_data *);
 extern int __must_check setup_files(struct thread_data *);
 extern int __must_check open_files(struct thread_data *);
+extern int reopen_file(struct thread_data *, struct fio_file *);
 extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
+extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
+extern void generic_close_file(struct thread_data *, struct fio_file *);
 
 /*
  * ETA/status stuff
@@ -667,6 +687,7 @@ extern void requeue_io_u(struct thread_data *, struct io_u **);
 extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *);
 extern long __must_check io_u_queued_complete(struct thread_data *, int);
 extern void io_u_queued(struct thread_data *, struct io_u *);
+extern void io_u_log_error(struct thread_data *, struct io_u *);
 extern void io_u_init_timeout(void);
 extern void io_u_set_timeout(struct thread_data *);
 
@@ -679,6 +700,8 @@ extern int __must_check td_io_queue(struct thread_data *, struct io_u *);
 extern int __must_check td_io_sync(struct thread_data *, struct fio_file *);
 extern int __must_check td_io_getevents(struct thread_data *, int, int, struct timespec *);
 extern int __must_check td_io_commit(struct thread_data *);
+extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
+extern void td_io_close_file(struct thread_data *, struct fio_file *);
 
 /*
  * This is a pretty crappy semaphore implementation, but with the use that fio
@@ -713,6 +736,9 @@ static inline void fio_sem_up(volatile int *sem)
 		fprintf(stderr, ##args);	\
 	} while (0)
 
+FILE *get_f_out(void);
+FILE *get_f_err(void);
+
 struct ioengine_ops {
 	struct list_head list;
 	char name[16];
@@ -727,12 +753,13 @@ 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 (*open_file)(struct thread_data *, struct fio_file *);
+	void (*close_file)(struct thread_data *, struct fio_file *);
 	void *data;
 	void *dlhandle;
-	unsigned long priv;
 };
 
-#define FIO_IOOPS_VERSION	5
+#define FIO_IOOPS_VERSION	6
 
 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
 extern void register_ioengine(struct ioengine_ops *);
@@ -749,7 +776,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) < (int) (td)->nr_files; (i)++, (f)++)
+	for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->open_files; (i)++, (f)++)
 
 #define fio_assert(td, cond)	do {	\
 	if (!(cond)) {			\