Add verify_fatal option

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index eb36d1cfd01a2e06a2305c96d76b460ee18c2d40..6b111555d54363f28e1973b83c700d2b5297e35c 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -12,16 +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 "crc64.h"
-#include "crc32.h"
-#include "crc16.h"
-#include "crc7.h"
 #include "arch/arch.h"
 #include "os/os.h"
 #include "mutex.h"
@@ -199,23 +195,50 @@ enum {
        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_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 long crc64;
-               unsigned long crc32;
-               unsigned short crc16;
-               unsigned char crc7;
-       };
+};
+
+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 {
@@ -394,9 +417,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;