unsigned char *p, unsigned int len)
{
unsigned int todo;
- double r;
+ int r;
while (len) {
- r = os_random_double(&td->verify_state);
+ r = os_random_long(&td->verify_state);
/*
* lrand48_r seems to be broken and only fill the bottom
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;
+ unsigned short c;
+
+ p += sizeof(*hdr);
+ c = crc16(p, hdr->len - sizeof(*hdr));
+
+ if (c != hdr->crc16) {
+ log_err("crc16: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
+ log_err("crc16: wanted %x, got %x\n", hdr->crc16, c);
+ return 1;
+ }
+
+ return 0;
+}
+
static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u)
{
- unsigned char *p = (unsigned char *) io_u->buf;
+ unsigned char *p = io_u->buf;
unsigned long c;
p += sizeof(*hdr);
static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
{
- unsigned char *p = (unsigned char *) io_u->buf;
+ unsigned char *p = io_u->buf;
struct md5_ctx md5_ctx;
memset(&md5_ctx, 0, sizeof(md5_ctx));
struct verify_header *hdr = (struct verify_header *) io_u->buf;
int ret;
- if (td->o.verify == VERIFY_NULL)
+ if (td->o.verify == VERIFY_NULL || io_u->ddir != DDIR_READ)
return 0;
if (hdr->fio_magic != FIO_HDR_MAGIC) {
return EIO;
}
- if (hdr->verify_type == VERIFY_MD5)
+ switch (hdr->verify_type) {
+ case VERIFY_MD5:
ret = verify_io_u_md5(hdr, io_u);
- else if (hdr->verify_type == VERIFY_CRC32)
+ break;
+ case VERIFY_CRC32:
ret = verify_io_u_crc32(hdr, io_u);
- else {
+ break;
+ case VERIFY_CRC16:
+ ret = verify_io_u_crc16(hdr, io_u);
+ break;
+ case VERIFY_CRC7:
+ ret = verify_io_u_crc7(hdr, io_u);
+ break;
+ default:
log_err("Bad verify type %u\n", hdr->verify_type);
ret = 1;
}
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);
+}
+
static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
{
hdr->crc32 = crc32(p, 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;
+ 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)