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

diff --git a/fio.h b/fio.h
index b7d8582e..fe314bfd 100644
--- a/fio.h
+++ b/fio.h
@@ -12,13 +12,12 @@
 #include <unistd.h>
 #include <string.h>
 #include <getopt.h>
+#include <inttypes.h>
 
 #include "compiler/compiler.h"
 #include "list.h"
 #include "fifo.h"
 #include "rbtree.h"
-#include "md5.h"
-#include "crc32.h"
 #include "arch/arch.h"
 #include "os/os.h"
 #include "mutex.h"
@@ -176,6 +175,11 @@ struct io_u {
 	 * Callback for io completion
 	 */
 	int (*end_io)(struct thread_data *, struct io_u *);
+
+	/*
+	 * Called when io_u is about to be freed
+	 */
+	void (*unmap)(struct thread_data *, struct io_u *);
 };
 
 /*
@@ -192,21 +196,55 @@ 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_SHA256,			/* sha256 sum data blocks */
+	VERIFY_SHA512,			/* sha512 sum data blocks */
+	VERIFY_META,			/* block_num, timestamp etc. */
+	VERIFY_PATTERN,			/* verify a specific pattern */
 	VERIFY_NULL,			/* pretend to verify */
 };
 
 /*
- * A header structure associated with each checksummed data block
+ * A header structure associated with each checksummed data block. It is
+ * followed by a checksum specific header that contains the verification
+ * data.
  */
 struct verify_header {
 	unsigned int fio_magic;
 	unsigned int len;
 	unsigned int verify_type;
-	union {
-		char md5_digest[MD5_HASH_WORDS * 4];
-		unsigned long crc32;
-	};
+};
+
+struct vhdr_md5 {
+	uint32_t md5_digest[16];
+};
+struct vhdr_sha512 {
+	uint8_t sha512[128];
+};
+struct vhdr_sha256 {
+	uint8_t sha256[128];
+};
+struct vhdr_crc64 {
+	uint64_t crc64;
+};
+struct vhdr_crc32 {
+	uint32_t crc32;
+};
+struct vhdr_crc16 {
+	uint16_t crc16;
+};
+struct vhdr_crc7 {
+	uint8_t crc7;
+};
+struct vhdr_meta {
+	uint64_t offset;
+	unsigned char thread;
+	unsigned short numberio;
+	unsigned long time_sec;
+	unsigned long time_usec;
 };
 
 struct group_run_stats {
@@ -243,6 +281,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 {
@@ -384,7 +423,13 @@ struct thread_options {
 	unsigned int end_fsync;
 	unsigned int sync_io;
 	unsigned int verify;
+	unsigned int do_verify;
 	unsigned int verifysort;
+	unsigned int verify_interval;
+	unsigned int verify_offset;
+	unsigned int verify_pattern;
+	unsigned int verify_pattern_bytes;
+	unsigned int verify_fatal;
 	unsigned int use_thread;
 	unsigned int unlink;
 	unsigned int do_disk_util;
@@ -472,6 +517,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;