Fix refill buffers overwriting verify data

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index e44fce08b51065cf4d6ad9feaf87f6878ee4ff25..fb6876366904378e5ee3b3dadf5463958e120552 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -198,6 +198,8 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
        if (td->io_ops->getevents)
                r = td->io_ops->getevents(td, min, max, t);
 out:
+       if (r >= 0)
+               io_u_mark_complete(td, r);
        dprint(FD_IO, "getevents: %d\n", r);
        return r;
 }
@@ -237,14 +239,25 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        unlock_file(td, io_u->file);
 
-       if (ret != FIO_Q_BUSY)
-               io_u_mark_depth(td, io_u);
+       if (!td->io_ops->commit) {
+               io_u_mark_submit(td, 1);
+               io_u_mark_complete(td, 1);
+       }
 
-       if (ret == FIO_Q_QUEUED) {
+       if (ret == FIO_Q_COMPLETED) {
+               if (io_u->ddir != DDIR_SYNC) {
+                       io_u_mark_depth(td, 1);
+                       td->ts.total_io_u[io_u->ddir]++;
+               }
+       } else if (ret == FIO_Q_QUEUED) {
                int r;
 
-               td->io_u_queued++;
-               if (td->io_u_queued > td->o.iodepth_batch) {
+               if (io_u->ddir != DDIR_SYNC) {
+                       td->io_u_queued++;
+                       td->ts.total_io_u[io_u->ddir]++;
+               }
+
+               if (td->io_u_queued >= td->o.iodepth_batch) {
                        r = td_io_commit(td);
                        if (r < 0)
                                return r;
@@ -288,10 +301,12 @@ int td_io_commit(struct thread_data *td)
 {
        dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
 
-       if (!td->cur_depth)
+       if (!td->cur_depth || !td->io_u_queued)
                return 0;
 
+       io_u_mark_depth(td, td->io_u_queued);
        td->io_u_queued = 0;
+
        if (td->io_ops->commit)
                return td->io_ops->commit(td);
 
@@ -319,8 +334,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       f->last_free_lookup = 0;
-       f->last_pos = f->file_offset;
+       fio_file_reset(f);
        f->flags |= FIO_FILE_OPEN;
        f->flags &= ~FIO_FILE_CLOSING;