Revert "client: respect terse output on client <--> backend relationship"

[fio.git] / verify.h

diff --git a/verify.h b/verify.h
index bb3fd492ccbca7c3d7e2d354d7f91ba781e54b8a..64121a51af97d68e75fefe12dc178f3b3218b0ce 100644 (file)
--- a/verify.h
+++ b/verify.h
@@ -2,11 +2,16 @@
 #define FIO_VERIFY_H
 
 #include <stdint.h>
+#include "compiler/compiler.h"
+#include "verify-state.h"
 
 #define FIO_HDR_MAGIC  0xacca
 
 enum {
        VERIFY_NONE = 0,                /* no verification */
+       VERIFY_HDR_ONLY,                /* verify header only, kept for sake of
+                                        * compatibility with old configurations
+                                        * which use 'verify=meta' */
        VERIFY_MD5,                     /* md5 sum data blocks */
        VERIFY_CRC64,                   /* crc64 sum data blocks */
        VERIFY_CRC32,                   /* crc32 sum data blocks */
@@ -16,10 +21,14 @@ enum {
        VERIFY_CRC7,                    /* crc7 sum data blocks */
        VERIFY_SHA256,                  /* sha256 sum data blocks */
        VERIFY_SHA512,                  /* sha512 sum data blocks */
+       VERIFY_SHA3_224,                /* sha3-224 sum data blocks */
+       VERIFY_SHA3_256,                /* sha3-256 sum data blocks */
+       VERIFY_SHA3_384,                /* sha3-384 sum data blocks */
+       VERIFY_SHA3_512,                /* sha3-512 sum data blocks */
        VERIFY_XXHASH,                  /* xxhash sum data blocks */
-       VERIFY_META,                    /* block_num, timestamp etc. */
        VERIFY_SHA1,                    /* sha1 sum data blocks */
        VERIFY_PATTERN,                 /* verify specific patterns */
+       VERIFY_PATTERN_NO_HDR,          /* verify specific patterns, no hdr */
        VERIFY_NULL,                    /* pretend to verify */
 };
 
@@ -33,12 +42,29 @@ struct verify_header {
        uint16_t verify_type;
        uint32_t len;
        uint64_t rand_seed;
+       uint64_t offset;
+       uint32_t time_sec;
+       uint32_t time_nsec;
+       uint16_t thread;
+       uint16_t numberio;
        uint32_t crc32;
 };
 
 struct vhdr_md5 {
        uint32_t md5_digest[4];
 };
+struct vhdr_sha3_224 {
+       uint8_t sha[224 / 8];
+};
+struct vhdr_sha3_256 {
+       uint8_t sha[256 / 8];
+};
+struct vhdr_sha3_384 {
+       uint8_t sha[384 / 8];
+};
+struct vhdr_sha3_512 {
+       uint8_t sha[512 / 8];
+};
 struct vhdr_sha512 {
        uint8_t sha512[128];
 };
@@ -60,13 +86,6 @@ struct vhdr_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 vhdr_xxhash {
        uint32_t hash;
 };
@@ -88,4 +107,9 @@ extern void fio_verify_init(struct thread_data *td);
 extern int verify_async_init(struct thread_data *);
 extern void verify_async_exit(struct thread_data *);
 
+/*
+ * Callbacks for pasting formats in the pattern buffer
+ */
+extern int paste_blockoff(char *buf, unsigned int len, void *priv);
+
 #endif