Style fixups
[fio.git] / verify.c
index 3cda3267c9f7262f88aa59f71dfb33614d0fcdf6..0bb348ff996995750cc797eca653f5567160e980 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -43,9 +43,11 @@ static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
 {
        switch (td->o.verify_pattern_bytes) {
        case 0:
+               dprint(FD_VERIFY, "fill random bytes len=%u\n", len);
                fill_random_bytes(td, p, len);
                break;
        case 1:
+               dprint(FD_VERIFY, "fill verify pattern b=0 len=%u\n", len);
                memset(p, td->o.verify_pattern, len);
                break;
        case 2:
@@ -56,6 +58,9 @@ static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
                unsigned char c1, c2, c3, c4;
                unsigned char *b = p;
 
+               dprint(FD_VERIFY, "fill verify pattern b=%d len=%u\n",
+                                       td->o.verify_pattern_bytes, len);
+
                c1 = pattern & 0xff;
                pattern >>= 8;
                c2 = pattern & 0xff;
@@ -162,21 +167,21 @@ static void *hdr_priv(struct verify_header *hdr)
  * 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)
+                                   struct io_u *io_u, unsigned char header_num)
 {
        return io_u->buf + header_num * hdr->len + hdr_size(hdr);
 }
 
 static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
-                            struct io_u *io_u, unsigned int header_num)
+                           struct io_u *io_u, unsigned int header_num)
 {
        struct vhdr_meta *vh = hdr_priv(hdr);
 
+       dprint(FD_VERIFY, "meta verify io_u %p, len %u\n", io_u, hdr->len);
+
        if (vh->offset != io_u->offset + header_num * td->o.verify_interval) {
                log_err("meta: verify failed at %llu/%u\n",
-                             io_u->offset + header_num * hdr->len,
-                             hdr->len);
+                               io_u->offset + header_num * hdr->len, hdr->len);
                return EIO;
        }
 
@@ -193,13 +198,14 @@ static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
                .buf = sha512,
        };
 
+       dprint(FD_VERIFY, "sha512 verify io_u %p, len %u\n", io_u, hdr->len);
+
        sha512_init(&sha512_ctx);
        sha512_update(&sha512_ctx, p, hdr->len - hdr_size(hdr));
 
        if (memcmp(vh->sha512, sha512_ctx.buf, sizeof(sha512))) {
                log_err("sha512: verify failed at %llu/%u\n",
-                             io_u->offset + header_num * hdr->len,
-                             hdr->len);
+                               io_u->offset + header_num * hdr->len, hdr->len);
                hexdump(vh->sha512, sizeof(vh->sha512));
                hexdump(sha512_ctx.buf, sizeof(sha512));
                return EIO;
@@ -218,13 +224,14 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
                .buf = sha256,
        };
 
+       dprint(FD_VERIFY, "sha256 verify io_u %p, len %u\n", io_u, hdr->len);
+
        sha256_init(&sha256_ctx);
        sha256_update(&sha256_ctx, p, hdr->len - hdr_size(hdr));
 
        if (memcmp(vh->sha256, sha256_ctx.buf, sizeof(sha256))) {
                log_err("sha256: verify failed at %llu/%u\n",
-                             io_u->offset + header_num * hdr->len,
-                             hdr->len);
+                               io_u->offset + header_num * hdr->len, hdr->len);
                hexdump(vh->sha256, sizeof(vh->sha256));
                hexdump(sha256_ctx.buf, sizeof(sha256));
                return EIO;
@@ -234,18 +241,19 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
 }
 
 static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
-                            unsigned char header_num)
+                           unsigned char header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
        struct vhdr_crc7 *vh = hdr_priv(hdr);
        unsigned char c;
 
+       dprint(FD_VERIFY, "crc7 verify io_u %p, len %u\n", io_u, hdr->len);
+
        c = crc7(p, hdr->len - hdr_size(hdr));
 
        if (c != vh->crc7) {
                log_err("crc7: verify failed at %llu/%u\n",
-                               io_u->offset + header_num * hdr->len,
-                               hdr->len);
+                               io_u->offset + header_num * hdr->len, hdr->len);
                log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
                return EIO;
        }
@@ -254,18 +262,19 @@ 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 int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
        struct vhdr_crc16 *vh = hdr_priv(hdr);
        unsigned short c;
 
+       dprint(FD_VERIFY, "crc16 verify io_u %p, len %u\n", io_u, hdr->len);
+
        c = crc16(p, hdr->len - hdr_size(hdr));
 
        if (c != vh->crc16) {
                log_err("crc16: verify failed at %llu/%u\n",
-                               io_u->offset + header_num * hdr->len,
-                               hdr->len);
+                               io_u->offset + header_num * hdr->len, hdr->len);
                log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
                return EIO;
        }
@@ -274,19 +283,22 @@ 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 int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
        struct vhdr_crc64 *vh = hdr_priv(hdr);
        unsigned long long c;
 
+       dprint(FD_VERIFY, "crc64 verify io_u %p, len %u\n", io_u, hdr->len);
+
        c = crc64(p, hdr->len - hdr_size(hdr));
 
        if (c != vh->crc64) {
                log_err("crc64: verify failed at %llu/%u\n",
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
-               log_err("crc64: wanted %llx, got %llx\n", (unsigned long long) vh->crc64, c);
+               log_err("crc64: wanted %llx, got %llx\n",
+                                       (unsigned long long) vh->crc64, c);
                return EIO;
        }
 
@@ -294,18 +306,19 @@ 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 int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
        struct vhdr_crc32 *vh = hdr_priv(hdr);
        uint32_t c;
 
+       dprint(FD_VERIFY, "crc32 verify io_u %p, len %u\n", io_u, hdr->len);
+
        c = crc32(p, hdr->len - hdr_size(hdr));
 
        if (c != vh->crc32) {
                log_err("crc32: verify failed at %llu/%u\n",
-                               io_u->offset + header_num * hdr->len,
-                               hdr->len);
+                               io_u->offset + header_num * hdr->len, hdr->len);
                log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
                return EIO;
        }
@@ -314,7 +327,7 @@ 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 int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
        struct vhdr_md5 *vh = hdr_priv(hdr);
@@ -323,13 +336,14 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
                .hash = hash,
        };
 
+       dprint(FD_VERIFY, "md5 verify io_u %p, len %u\n", io_u, hdr->len);
+
        md5_init(&md5_ctx);
        md5_update(&md5_ctx, p, hdr->len - hdr_size(hdr));
 
        if (memcmp(vh->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);
+                               io_u->offset + header_num * hdr->len, hdr->len);
                hexdump(vh->md5_digest, sizeof(vh->md5_digest));
                hexdump(md5_ctx.hash, sizeof(hash));
                return EIO;
@@ -347,7 +361,7 @@ static unsigned int hweight8(unsigned int w)
 }
 
 int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
-                        char *buf, unsigned int len, unsigned int mod)
+                       char *buf, unsigned int len, unsigned int mod)
 {
        unsigned int i;
        char split_pattern[4];
@@ -390,7 +404,8 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                hdr_inc = td->o.verify_interval;
 
        ret = 0;
-       for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc, hdr_num++) {
+       for (p = io_u->buf; p < io_u->buf + io_u->buflen;
+            p += hdr_inc, hdr_num++) {
                if (ret && td->o.verify_fatal) {
                        td->terminate = 1;
                        break;
@@ -406,11 +421,13 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                }
 
                if (td->o.verify_pattern_bytes) {
+                       dprint(FD_VERIFY, "pattern verify io_u %p, len %u\n",
+                                                               io_u, hdr->len);
                        ret = verify_io_u_pattern(td->o.verify_pattern,
-                                                 td->o.verify_pattern_bytes,
-                                                 p + hdr_size,
-                                                 hdr_inc - hdr_size,
-                                                 hdr_size % 4);
+                                                 td->o.verify_pattern_bytes,
+                                                 p + hdr_size,
+                                                 hdr_inc - hdr_size,
+                                                 hdr_size % 4);
                        if (ret)
                                log_err("fio: verify failed at %llu/%u\n",
                                        io_u->offset + hdr_num * hdr->len,
@@ -453,7 +470,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 }
 
 static void fill_meta(struct verify_header *hdr, struct thread_data *td,
-                      struct io_u *io_u, unsigned int header_num)
+                     struct io_u *io_u, unsigned int header_num)
 {
        struct vhdr_meta *vh = hdr_priv(hdr);
 
@@ -547,7 +564,7 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
        if (td->o.verify_interval)
                hdr_inc = td->o.verify_interval;
 
-       for (;p < io_u->buf + io_u->buflen; p += hdr_inc) {
+       for (; p < io_u->buf + io_u->buflen; p += hdr_inc) {
                hdr = p;
 
                hdr->fio_magic = FIO_HDR_MAGIC;
@@ -558,27 +575,43 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
                data = p + hdr_size(hdr);
                switch (td->o.verify) {
                case VERIFY_MD5:
+                       dprint(FD_VERIFY, "fill md5 io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_md5(hdr, data, data_len);
                        break;
                case VERIFY_CRC64:
+                       dprint(FD_VERIFY, "fill crc64 io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_crc64(hdr, data, data_len);
                        break;
                case VERIFY_CRC32:
+                       dprint(FD_VERIFY, "fill crc32 io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_crc32(hdr, data, data_len);
                        break;
                case VERIFY_CRC16:
+                       dprint(FD_VERIFY, "fill crc16 io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_crc16(hdr, data, data_len);
                        break;
                case VERIFY_CRC7:
+                       dprint(FD_VERIFY, "fill crc7 io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_crc7(hdr, data, data_len);
                        break;
                case VERIFY_SHA256:
+                       dprint(FD_VERIFY, "fill sha256 io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_sha256(hdr, data, data_len);
                        break;
                case VERIFY_SHA512:
+                       dprint(FD_VERIFY, "fill sha512 io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_sha512(hdr, data, data_len);
                        break;
                case VERIFY_META:
+                       dprint(FD_VERIFY, "fill meta io_u %p, len %u\n",
+                                                       io_u, hdr->len);
                        fill_meta(hdr, td, io_u, header_num);
                        break;
                default:
@@ -619,8 +652,11 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
                if ((io_u->file->flags & FIO_FILE_OPEN) == 0) {
                        int r = td_io_open_file(td, io_u->file);
 
-                       if (r)
+                       if (r) {
+                               dprint(FD_VERIFY, "failed file %s open\n",
+                                               io_u->file->file_name);
                                return 1;
+                       }
                }
 
                get_file(ipo->file);
@@ -629,8 +665,10 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
                io_u->xfer_buf = io_u->buf;
                io_u->xfer_buflen = io_u->buflen;
                free(ipo);
+               dprint(FD_VERIFY, "get_next_verify: ret io_u %p\n", io_u);
                return 0;
        }
 
+       dprint(FD_VERIFY, "get_next_verify: empty\n");
        return 1;
 }