Speed up verify fill

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index cca070c8279f609456cb24e2c33a41dcfb292785..6c703eef73c3fa6911e6bc1ffc5de3923d0fe442 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -42,6 +42,23 @@ static void hexdump(void *buffer, int len)
        log_info("\n");
 }
 
+static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u)
+{
+       unsigned char *p = io_u->buf;
+       unsigned char c;
+
+       p += sizeof(*hdr);
+       c = crc7(p, hdr->len - sizeof(*hdr));
+
+       if (c != hdr->crc7) {
+               log_err("crc7: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
+               log_err("crc7: wanted %x, got %x\n", hdr->crc7, c);
+               return 1;
+       }
+
+       return 0;
+}
+
 static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u)
 {
        unsigned char *p = io_u->buf;
@@ -52,7 +69,7 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u)
 
        if (c != hdr->crc16) {
                log_err("crc16: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
-               log_err("crc16: wanted %lx, got %x\n", hdr->crc32, c);
+               log_err("crc16: wanted %x, got %x\n", hdr->crc16, c);
                return 1;
        }
 
@@ -114,6 +131,8 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                ret = verify_io_u_crc32(hdr, io_u);
        else if (hdr->verify_type == VERIFY_CRC16)
                ret = verify_io_u_crc16(hdr, io_u);
+       else if (hdr->verify_type == VERIFY_CRC7)
+               ret = verify_io_u_crc7(hdr, io_u);
        else {
                log_err("Bad verify type %u\n", hdr->verify_type);
                ret = 1;
@@ -125,6 +144,11 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
+static void fill_crc7(struct verify_header *hdr, void *p, unsigned int len)
+{
+       hdr->crc7 = crc7(p, len);
+}
+
 static void fill_crc16(struct verify_header *hdr, void *p, unsigned int len)
 {
        hdr->crc16 = crc16(p, len);
@@ -150,29 +174,38 @@ 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)
 {
-       unsigned char *p = (unsigned char *) io_u->buf;
-       struct verify_header hdr;
+       const unsigned int len = io_u->buflen - sizeof(struct verify_header);
+       struct verify_header *hdr;
+       unsigned char *p;
 
        if (td->o.verify == VERIFY_NULL)
                return;
 
-       hdr.fio_magic = FIO_HDR_MAGIC;
-       hdr.len = io_u->buflen;
-       p += sizeof(hdr);
-       fill_random_bytes(td, p, io_u->buflen - sizeof(hdr));
-
-       if (td->o.verify == VERIFY_MD5) {
-               fill_md5(&hdr, p, io_u->buflen - sizeof(hdr));
-               hdr.verify_type = VERIFY_MD5;
-       } else if (td->o.verify == VERIFY_CRC32) {
-               fill_crc32(&hdr, p, io_u->buflen - sizeof(hdr));
-               hdr.verify_type = VERIFY_CRC32;
-       } else if (td->o.verify == VERIFY_CRC16) {
-               fill_crc16(&hdr, p, io_u->buflen - sizeof(hdr));
-               hdr.verify_type = VERIFY_CRC16;
+       hdr = (struct verify_header *) io_u->buf;
+       hdr->fio_magic = FIO_HDR_MAGIC;
+       hdr->len = io_u->buflen;
+       hdr->verify_type = td->o.verify;
+
+       p = io_u->buf + sizeof(*hdr);
+       fill_random_bytes(td, p, len);
+
+       switch (td->o.verify) {
+       case VERIFY_MD5:
+               fill_md5(hdr, p, len);
+               break;
+       case VERIFY_CRC32:
+               fill_crc32(hdr, p, len);
+               break;
+       case VERIFY_CRC16:
+               fill_crc16(hdr, p, len);
+               break;
+       case VERIFY_CRC7:
+               fill_crc7(hdr, p, len);
+               break;
+       default:
+               log_err("fio: bad verify type: %d\n", td->o.verify);
+               assert(0);
        }
-
-       memcpy(io_u->buf, &hdr, sizeof(hdr));
 }
 
 int get_next_verify(struct thread_data *td, struct io_u *io_u)