Move the iodepth_batch into td_io_queue() instead

The previous part in do_io() introduced a bug (overwriting ret),
and we really need to do it from other locations as well.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/fio.c b/fio.c
index c5b85aeb8c88ca2ef732135fc74ffb8d789325c1..b095527e4d028d18ab30d185a7b25c4a93eba7ab 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -433,8 +433,6 @@ requeue:
                         */
                        if (td->io_ops->commit == NULL)
                                io_u_queued(td, io_u);
                         */
                        if (td->io_ops->commit == NULL)
                                io_u_queued(td, io_u);

-                       else if (td->io_u_queued >= td->iodepth_batch)
-                               ret = td_io_commit(td);

                        break;
                case FIO_Q_BUSY:
                        requeue_io_u(td, &io_u);
                        break;
                case FIO_Q_BUSY:
                        requeue_io_u(td, &io_u);

diff --git a/ioengines.c b/ioengines.c
index 2cc328883d806497b4f9028919cefe360ef3a377..14b15ccd7468e6646a03b962095a97fb55cff74a 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -216,8 +216,16 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        ret = td->io_ops->queue(td, io_u);
 
 
        ret = td->io_ops->queue(td, io_u);
 

-       if (ret == FIO_Q_QUEUED)
+       if (ret == FIO_Q_QUEUED) {
+               int r;
+

                td->io_u_queued++;
                td->io_u_queued++;

+               if (td->io_u_queued > td->iodepth_batch) {
+                       r = td_io_commit(td);
+                       if (r < 0)
+                               return r;
+               }
+       }

 
        if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
                fio_gettime(&io_u->issue_time, NULL);
 
        if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
                fio_gettime(&io_u->issue_time, NULL);