rbd: poll cleanups

[fio.git] / engines / rbd.c

diff --git a/engines/rbd.c b/engines/rbd.c
index c85645aeac3ec921e6b599071e951d45b10ceb7c..aa50c801c3c831eec13a5c212fdc836c7f85e675 100644 (file)
--- a/engines/rbd.c
+++ b/engines/rbd.c
@@ -9,12 +9,24 @@
 
 #include "../fio.h"
 #include "../optgroup.h"
+#ifdef CONFIG_RBD_BLKIN
+#include <zipkin_c.h>
+#endif
+
+#ifdef CONFIG_RBD_POLL
+/* add for poll */
+#include <poll.h>
+#include <sys/eventfd.h>
+#endif
 
 struct fio_rbd_iou {
        struct io_u *io_u;
        rbd_completion_t completion;
        int io_seen;
        int io_complete;
+#ifdef CONFIG_RBD_BLKIN
+       struct blkin_trace_info info;
+#endif
 };
 
 struct rbd_data {
@@ -23,6 +35,7 @@ struct rbd_data {
        rbd_image_t image;
        struct io_u **aio_events;
        struct io_u **sort_events;
+       int fd; /* add for poll */
 };
 
 struct rbd_options {
@@ -98,6 +111,9 @@ static int _fio_setup_rbd_data(struct thread_data *td,
        if (!rbd)
                goto failed;
 
+       /* add for poll, init fd: -1 */
+       rbd->fd = -1;
+
        rbd->aio_events = calloc(td->o.iodepth, sizeof(struct io_u *));
        if (!rbd->aio_events)
                goto failed;
@@ -121,6 +137,35 @@ failed:
 
 }
 
+#ifdef CONFIG_RBD_POLL
+static bool _fio_rbd_setup_poll(struct rbd_data *rbd)
+{
+       int r;
+
+       /* add for rbd poll */
+       rbd->fd = eventfd(0, EFD_NONBLOCK);
+       if (rbd->fd < 0) {
+               log_err("eventfd failed.\n");
+               return false;
+       }
+
+       r = rbd_set_image_notification(rbd->image, rbd->fd, EVENT_TYPE_EVENTFD);
+       if (r < 0) {
+               log_err("rbd_set_image_notification failed.\n");
+               close(rbd->fd);
+               rbd->fd = -1;
+               return false;
+       }
+
+       return true;
+}
+#else
+static bool _fio_rbd_setup_poll(struct rbd_data *rbd)
+{
+       return true;
+}
+#endif
+
 static int _fio_rbd_connect(struct thread_data *td)
 {
        struct rbd_data *rbd = td->io_ops_data;
@@ -182,8 +227,15 @@ static int _fio_rbd_connect(struct thread_data *td)
                log_err("rbd_open failed.\n");
                goto failed_open;
        }
+
+       if (!_fio_rbd_setup_poll(rbd))
+               goto failed_poll;
+
        return 0;
 
+failed_poll:
+       rbd_close(rbd->image);
+       rbd->image = NULL;
 failed_open:
        rados_ioctx_destroy(rbd->io_ctx);
        rbd->io_ctx = NULL;
@@ -199,6 +251,12 @@ static void _fio_rbd_disconnect(struct rbd_data *rbd)
        if (!rbd)
                return;
 
+       /* close eventfd */
+       if (rbd->fd != -1) {
+               close(rbd->fd);
+               rbd->fd = -1;
+       }
+
        /* shutdown everything */
        if (rbd->image) {
                rbd_close(rbd->image);
@@ -298,10 +356,32 @@ static int rbd_iter_events(struct thread_data *td, unsigned int *events,
        struct rbd_data *rbd = td->io_ops_data;
        unsigned int this_events = 0;
        struct io_u *io_u;
-       int i, sidx;
+       int i, sidx = 0;
+
+#ifdef CONFIG_RBD_POLL
+       int ret = 0;
+       int event_num = 0;
+       struct fio_rbd_iou *fri = NULL;
+       rbd_completion_t comps[min_evts];
+
+       struct pollfd pfd;
+       pfd.fd = rbd->fd;
+       pfd.events = POLLIN;
+
+       ret = poll(&pfd, 1, -1);
+       if (ret <= 0)
+               return 0;
 
-       sidx = 0;
+       assert(pfd.revents & POLLIN);
+
+       event_num = rbd_poll_io_events(rbd->image, comps, min_evts);
+
+       for (i = 0; i < event_num; i++) {
+               fri = rbd_aio_get_arg(comps[i]);
+               io_u = fri->io_u;
+#else
        io_u_qiter(&td->io_u_all, io_u, i) {
+#endif
                if (!(io_u->flags & IO_U_F_FLIGHT))
                        continue;
                if (rbd_io_u_seen(io_u))
@@ -391,16 +471,28 @@ static int fio_rbd_queue(struct thread_data *td, struct io_u *io_u)
        }
 
        if (io_u->ddir == DDIR_WRITE) {
+#ifdef CONFIG_RBD_BLKIN
+               blkin_init_trace_info(&fri->info);
+               r = rbd_aio_write_traced(rbd->image, io_u->offset, io_u->xfer_buflen,
+                                        io_u->xfer_buf, fri->completion, &fri->info);
+#else
                r = rbd_aio_write(rbd->image, io_u->offset, io_u->xfer_buflen,
                                         io_u->xfer_buf, fri->completion);
+#endif
                if (r < 0) {
                        log_err("rbd_aio_write failed.\n");
                        goto failed_comp;
                }
 
        } else if (io_u->ddir == DDIR_READ) {
+#ifdef CONFIG_RBD_BLKIN
+               blkin_init_trace_info(&fri->info);
+               r = rbd_aio_read_traced(rbd->image, io_u->offset, io_u->xfer_buflen,
+                                       io_u->xfer_buf, fri->completion, &fri->info);
+#else
                r = rbd_aio_read(rbd->image, io_u->offset, io_u->xfer_buflen,
                                        io_u->xfer_buf, fri->completion);
+#endif
 
                if (r < 0) {
                        log_err("rbd_aio_read failed.\n");