Unify and fixup error handling

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 64399797b9b97a03d3bb4375a75a09d43126a46b..ebcc8bb283eb6a65e93db799cfe9e2f83993f85e 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -389,6 +389,7 @@ void io_completed(struct thread_data *td, struct io_u *io_u,
        if (!io_u->error) {
                unsigned int bytes = io_u->buflen - io_u->resid;
                const enum fio_ddir idx = io_u->ddir;
+               int ret;
 
                td->io_blocks[idx]++;
                td->io_bytes[idx] += bytes;
@@ -407,14 +408,23 @@ void io_completed(struct thread_data *td, struct io_u *io_u,
                        log_io_piece(td, io_u);
 
                icd->bytes_done[idx] += bytes;
+
+               if (icd->handler) {
+                       ret = icd->handler(io_u);
+                       if (ret && !icd->error)
+                               icd->error = ret;
+               }
        } else
                icd->error = io_u->error;
 }
 
-void init_icd(struct io_completion_data *icd)
+void init_icd(struct io_completion_data *icd, icd_handler *handler, int nr)
 {
        fio_gettime(&icd->time, NULL);
 
+       icd->handler = handler;
+       icd->nr = nr;
+
        icd->error = 0;
        icd->bytes_done[0] = icd->bytes_done[1] = 0;
 }
@@ -424,8 +434,6 @@ void ios_completed(struct thread_data *td, struct io_completion_data *icd)
        struct io_u *io_u;
        int i;
 
-       init_icd(icd);
-
        for (i = 0; i < icd->nr; i++) {
                io_u = td->io_ops->event(td, i);