X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=e97caf18bc1bdbea46751be177639bd66cd44919;hp=2104e3a9325dd2456c2dfe91a6837c5c9d08a9c8;hb=546a9142511875524850ac92776184fd9fb7196e;hpb=5e62c22a669c7a8c03b7871852cf85ad6d355980

diff --git a/fio.h b/fio.h
index 2104e3a9..e97caf18 100644
--- a/fio.h
+++ b/fio.h
@@ -18,7 +18,10 @@
 #include "fifo.h"
 #include "rbtree.h"
 #include "md5.h"
+#include "crc64.h"
 #include "crc32.h"
+#include "crc16.h"
+#include "crc7.h"
 #include "arch/arch.h"
 #include "os/os.h"
 #include "mutex.h"
@@ -35,6 +38,7 @@ enum fio_ddir {
 	DDIR_READ = 0,
 	DDIR_WRITE,
 	DDIR_SYNC,
+	DDIR_INVAL = -1,
 };
 
 enum td_ddir {
@@ -85,11 +89,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
@@ -185,7 +195,10 @@ enum {
 enum {
 	VERIFY_NONE = 0,		/* no verification */
 	VERIFY_MD5,			/* md5 sum data blocks */
+	VERIFY_CRC64,			/* crc64 sum data blocks */
 	VERIFY_CRC32,			/* crc32 sum data blocks */
+	VERIFY_CRC16,			/* crc16 sum data blocks */
+	VERIFY_CRC7,			/* crc7 sum data blocks */
 	VERIFY_NULL,			/* pretend to verify */
 };
 
@@ -198,7 +211,10 @@ struct verify_header {
 	unsigned int verify_type;
 	union {
 		char md5_digest[MD5_HASH_WORDS * 4];
+		unsigned long long crc64;
 		unsigned long crc32;
+		unsigned short crc16;
+		unsigned char crc7;
 	};
 };
 
@@ -236,6 +252,7 @@ enum fio_ioengine_flags {
 	FIO_DISKLESSIO	= 1 << 2,	/* no disk involved */
 	FIO_NOEXTEND	= 1 << 3,	/* engine can't extend file */
 	FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
+	FIO_UNIDIR	= 1 << 5,	/* engine is uni-directional */
 };
 
 enum fio_file_flags {
@@ -295,7 +312,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;
@@ -333,7 +351,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];
 
@@ -376,6 +395,8 @@ struct thread_options {
 	unsigned int sync_io;
 	unsigned int verify;
 	unsigned int verifysort;
+	unsigned int header_interval;
+	unsigned int header_offset;
 	unsigned int use_thread;
 	unsigned int unlink;
 	unsigned int do_disk_util;
@@ -463,6 +484,7 @@ struct thread_data {
 		os_random_state_t next_file_state;
 	};
 	int error;
+	int done;
 	pid_t pid;
 	char *orig_buffer;
 	size_t orig_buffer_size;
@@ -513,6 +535,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;
@@ -671,8 +694,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 *);
@@ -735,12 +765,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