X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=b7d8582ebdcba3fc1c7b6a3c99e2b434cabbd8ed;hb=f29b25a370598d387e539c3dcae126274c6cbf4d;hp=6ee0d6aa2d1ef9bc3c1ecb807116b7bf77d691ec;hpb=0db2679750e4cc8f38af7af135f1ba8481d6def6;p=fio.git

diff --git a/fio.h b/fio.h
index 6ee0d6aa..b7d8582e 100644
--- a/fio.h
+++ b/fio.h
@@ -35,6 +35,7 @@ enum fio_ddir {
 	DDIR_READ = 0,
 	DDIR_WRITE,
 	DDIR_SYNC,
+	DDIR_INVAL = -1,
 };
 
 enum td_ddir {
@@ -85,11 +86,17 @@ struct io_piece {
 		struct rb_node rb_node;
 		struct list_head list;
 	};
-	struct fio_file *file;
+	union {
+		int fileno;
+		struct fio_file *file;
+	};
 	unsigned long long offset;
 	unsigned long len;
 	enum fio_ddir ddir;
-	unsigned long delay;
+	union {
+		unsigned long delay;
+		unsigned int file_action;
+	};
 };
 
 #ifdef FIO_HAVE_SYSLET
@@ -268,6 +275,7 @@ struct fio_file {
 	 */
 	char *file_name;
 	void *mmap;
+	unsigned int major, minor;
 
 	/*
 	 * size of the file, offset into file, and io size from that offset
@@ -294,7 +302,8 @@ struct fio_file {
  * How many depth levels to log
  */
 #define FIO_IO_U_MAP_NR	8
-#define FIO_IO_U_LAT_NR 12
+#define FIO_IO_U_LAT_U_NR 10
+#define FIO_IO_U_LAT_M_NR 12
 
 struct thread_stat {
 	char *name;
@@ -332,7 +341,8 @@ struct thread_stat {
 	 * 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 int io_u_lat_u[FIO_IO_U_LAT_U_NR];
+	unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR];
 	unsigned long total_io_u[2];
 	unsigned long short_io_u[2];
 
@@ -405,6 +415,7 @@ struct thread_options {
 	unsigned int new_group;
 	unsigned int numjobs;
 	os_cpu_mask_t cpumask;
+	unsigned int cpumask_set;
 	unsigned int iolog;
 	unsigned int rwmixcycle;
 	unsigned int rwmix[2];
@@ -511,6 +522,7 @@ struct thread_data {
 	unsigned long io_issues[2];
 	unsigned long long io_blocks[2];
 	unsigned long long io_bytes[2];
+	unsigned long long io_skip_bytes;
 	unsigned long long this_io_bytes[2];
 	unsigned long long zone_bytes;
 	struct fio_sem *mutex;
@@ -669,8 +681,15 @@ struct disk_util {
 /*
  * Log exports
  */
+enum file_log_act {
+	FIO_LOG_ADD_FILE,
+	FIO_LOG_OPEN_FILE,
+	FIO_LOG_CLOSE_FILE,
+};
+
 extern int __must_check read_iolog_get(struct thread_data *, struct io_u *);
-extern void write_iolog_put(struct thread_data *, struct io_u *);
+extern void log_io_u(struct thread_data *, struct io_u *);
+extern void log_file(struct thread_data *, struct fio_file *, enum file_log_act);
 extern int __must_check init_iolog(struct thread_data *td);
 extern void log_io_piece(struct thread_data *, struct io_u *);
 extern void prune_io_piece_log(struct thread_data *);
@@ -733,12 +752,14 @@ extern int __must_check open_files(struct thread_data *);
 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 *);
-extern void add_file(struct thread_data *, const char *);
+extern int 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 *);
 extern int init_random_map(struct thread_data *);
 extern void dup_files(struct thread_data *, struct thread_data *);
+extern int get_fileno(struct thread_data *, const char *);
+extern void free_release_files(struct thread_data *);
 
 /*
  * ETA/status stuff
@@ -824,8 +845,10 @@ extern void td_io_close_file(struct thread_data *, struct fio_file *);
 /*
  * blktrace support
  */
+#ifdef FIO_HAVE_BLKTRACE
 extern int is_blktrace(const char *);
 extern int load_blktrace(struct thread_data *, const char *);
+#endif
 
 /*
  * If logging output to a file, stderr should go to both stderr and f_err