X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=32e7a041dec521b52574f0de1b9d37e28604f888;hp=f2ef10792a2c53969a894b94cccc3d8788ee9e07;hb=d8602dd08170e11fb91dccde945bc527dbba57aa;hpb=3af6ef399a9df324ffe4a8c8e03b52a42f587229

diff --git a/verify.c b/verify.c
index f2ef1079..32e7a041 100644
--- a/verify.c
+++ b/verify.c
@@ -4,9 +4,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
+#include <assert.h>
 
 #include "fio.h"
-#include "os.h"
 
 static void fill_random_bytes(struct thread_data *td,
 			      unsigned char *p, unsigned int len)
@@ -38,8 +38,8 @@ static void hexdump(void *buffer, int len)
 	int i;
 
 	for (i = 0; i < len; i++)
-		fprintf(f_out, "%02x", p[i]);
-	fprintf(f_out, "\n");
+		log_info("%02x", p[i]);
+	log_info("\n");
 }
 
 static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u)
@@ -78,14 +78,17 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
 	return 0;
 }
 
-int verify_io_u(struct io_u *io_u)
+int verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
 	struct verify_header *hdr = (struct verify_header *) io_u->buf;
 	int ret;
 
+	if (td->o.verify == VERIFY_NULL)
+		return 0;
+
 	if (hdr->fio_magic != FIO_HDR_MAGIC) {
 		log_err("Bad verify header %x\n", hdr->fio_magic);
-		return 1;
+		return EIO;
 	}
 
 	if (hdr->verify_type == VERIFY_MD5)
@@ -97,7 +100,10 @@ int verify_io_u(struct io_u *io_u)
 		ret = 1;
 	}
 
-	return ret;
+	if (ret)
+		return EIO;
+
+	return 0;
 }
 
 static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
@@ -123,15 +129,18 @@ 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;
 
+	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->verify == VERIFY_MD5) {
+	if (td->o.verify == VERIFY_MD5) {
 		fill_md5(&hdr, p, io_u->buflen - sizeof(hdr));
 		hdr.verify_type = VERIFY_MD5;
-	} else {
+	} else if (td->o.verify == VERIFY_CRC32) {
 		fill_crc32(&hdr, p, io_u->buflen - sizeof(hdr));
 		hdr.verify_type = VERIFY_CRC32;
 	}
@@ -141,16 +150,38 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 
 int get_next_verify(struct thread_data *td, struct io_u *io_u)
 {
-	struct io_piece *ipo;
+	struct io_piece *ipo = NULL;
 
-	if (!list_empty(&td->io_hist_list)) {
-		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+	/*
+	 * this io_u is from a requeue, we already filled the offsets
+	 */
+	if (io_u->file)
+		return 0;
+
+	if (!RB_EMPTY_ROOT(&td->io_hist_tree)) {
+		struct rb_node *n = rb_first(&td->io_hist_tree);
 
+		ipo = rb_entry(n, struct io_piece, rb_node);
+		rb_erase(n, &td->io_hist_tree);
+	} else if (!list_empty(&td->io_hist_list)) {
+		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
 		list_del(&ipo->list);
+	}
 
+	if (ipo) {
 		io_u->offset = ipo->offset;
 		io_u->buflen = ipo->len;
 		io_u->file = ipo->file;
+
+		if ((io_u->file->flags & FIO_FILE_OPEN) == 0) {
+			int r = td_io_open_file(td, io_u->file);
+
+			if (r)
+				return 1;
+		}
+
+		get_file(ipo->file);
+		assert(io_u->file->flags & FIO_FILE_OPEN);
 		io_u->ddir = DDIR_READ;
 		io_u->xfer_buf = io_u->buf;
 		io_u->xfer_buflen = io_u->buflen;