IO verification needs to open and grab a reference to a file

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 99b21e8fd922e5f0d3124df5d9e6be7b7438d484..32e7a041dec521b52574f0de1b9d37e28604f888 100644 (file)
--- 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)
@@ -150,8 +150,7 @@ 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 rb_node *n;
+       struct io_piece *ipo = NULL;
 
        /*
         * this io_u is from a requeue, we already filled the offsets
@@ -159,15 +158,30 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
        if (io_u->file)
                return 0;
 
-       n = rb_first(&td->io_hist_tree);
-       if (n) {
-               ipo = rb_entry(n, struct io_piece, rb_node);
+       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;