Document parser int taking hex input

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 8bc34571076d403475e764a4ec41df6554234431..d98dfcf4c52b8bd5a43411bb2cf8397c6fd0952d 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -9,7 +9,7 @@
 #include "fio.h"
 
 static void fill_random_bytes(struct thread_data *td,
-                             unsigned char *p, unsigned int len)
+                             void *p, unsigned int len)
 {
        unsigned int todo;
        int r;
@@ -50,13 +50,22 @@ static void hexdump(void *buffer, int len)
        log_info("\n");
 }
 
+/*
+ * Return data area 'header_num'
+ */
+static inline void *io_u_verify_off(struct verify_header *hdr,
+                                   struct io_u *io_u,
+                                   unsigned char header_num)
+{
+       return io_u->buf + sizeof(*hdr) + header_num * hdr->len;
+}
+
 static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
                             unsigned char header_num)
 {
-       unsigned char *p = io_u->buf;
+       void *p = io_u_verify_off(hdr, io_u, header_num);
        unsigned char c;
 
-       p += header_num * hdr->len + sizeof(*hdr);
        c = crc7(p, hdr->len - sizeof(*hdr));
 
        if (c != hdr->crc7) {
@@ -73,10 +82,9 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
 static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
                              unsigned int header_num)
 {
-       unsigned char *p = io_u->buf;
+       void *p = io_u_verify_off(hdr, io_u, header_num);
        unsigned short c;
 
-       p += header_num * hdr->len + sizeof(*hdr);
        c = crc16(p, hdr->len - sizeof(*hdr));
 
        if (c != hdr->crc16) {
@@ -93,10 +101,9 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
 static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
                              unsigned int header_num)
 {
-       unsigned char *p = io_u->buf;
+       void *p = io_u_verify_off(hdr, io_u, header_num);
        unsigned long long c;
 
-       p += header_num * hdr->len + sizeof(*hdr);
        c = crc64(p, hdr->len - sizeof(*hdr));
 
        if (c != hdr->crc64) {
@@ -113,10 +120,9 @@ static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
 static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
                             unsigned int header_num)
 {
-       unsigned char *p = io_u->buf;
+       void *p = io_u_verify_off(hdr, io_u, header_num);
        unsigned long c;
 
-       p += header_num * hdr->len + sizeof(*hdr);
        c = crc32(p, hdr->len - sizeof(*hdr));
 
        if (c != hdr->crc32) {
@@ -133,16 +139,16 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
 static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
                           unsigned int header_num)
 {
-       unsigned char *p = io_u->buf;
+       void *p = io_u_verify_off(hdr, io_u, header_num);
        uint32_t hash[MD5_HASH_WORDS];
        struct md5_ctx md5_ctx = {
                .hash = hash,
        };
 
-       p += header_num * hdr->len + sizeof(*hdr);
+       memset(md5_ctx.hash, 0, sizeof(hdr->md5_digest));
        md5_update(&md5_ctx, p, hdr->len - sizeof(*hdr));
 
-       if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash))) {
+       if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(hash))) {
                log_err("md5: verify failed at %llu/%u\n",
                              io_u->offset + header_num * hdr->len,
                              hdr->len);
@@ -156,23 +162,23 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
 
 int verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
-       unsigned char *p = (unsigned char*) io_u->buf;
        struct verify_header *hdr;
        unsigned int hdr_inc, hdr_num = 0;
+       void *p;
        int ret;
 
        if (td->o.verify == VERIFY_NULL || io_u->ddir != DDIR_READ)
                return 0;
 
        hdr_inc = io_u->buflen;
-       if (td->o.header_interval)
-               hdr_inc = td->o.header_interval;
+       if (td->o.verify_interval)
+               hdr_inc = td->o.verify_interval;
 
-       for (; p < (unsigned char*) io_u->buf + io_u->buflen; p += hdr_inc) {
-               if (td->o.header_offset)
-                       memswp(p, &p[td->o.header_offset], sizeof(*hdr));
+       for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc) {
+               if (td->o.verify_offset)
+                       memswp(p, p + td->o.verify_offset, sizeof(*hdr));
 
-               hdr = (struct verify_header*) p;
+               hdr = p;
 
                if (hdr->fio_magic != FIO_HDR_MAGIC) {
                        log_err("Bad verify header %x\n", hdr->fio_magic);
@@ -231,6 +237,7 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
                .hash = (uint32_t *) hdr->md5_digest,
        };
 
+       memset(md5_ctx.hash, 0, sizeof(hdr->md5_digest));
        md5_update(&md5_ctx, p, len);
 }
 
@@ -241,7 +248,7 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
 void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
        struct verify_header *hdr;
-       unsigned char *p = io_u->buf, *data;
+       void *p = io_u->buf, *data;
        unsigned int hdr_inc, data_len;
 
        if (td->o.verify == VERIFY_NULL)
@@ -250,12 +257,12 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
        fill_random_bytes(td, p, io_u->buflen);
 
        hdr_inc = io_u->buflen;
-       if (td->o.header_interval)
-               hdr_inc = td->o.header_interval;
+       if (td->o.verify_interval)
+               hdr_inc = td->o.verify_interval;
        data_len = hdr_inc - sizeof(*hdr);
 
-       for (;p < (unsigned char*) io_u->buf + io_u->buflen; p += hdr_inc) {
-               hdr = (struct verify_header*) p;
+       for (;p < io_u->buf + io_u->buflen; p += hdr_inc) {
+               hdr = p;
 
                hdr->fio_magic = FIO_HDR_MAGIC;
                hdr->verify_type = td->o.verify;
@@ -282,8 +289,8 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
                        log_err("fio: bad verify type: %d\n", td->o.verify);
                        assert(0);
                }
-               if (td->o.header_offset)
-                       memswp(p, &p[td->o.header_offset], sizeof(*hdr));
+               if (td->o.verify_offset)
+                       memswp(p, p + td->o.verify_offset, sizeof(*hdr));
        }
 }