summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
53b6c97)
Would be nice to cleanup the ifdef in rbd_iter_events() as well.
Signed-off-by: Jens Axboe <axboe@fb.com>
rbd_image_t image;
struct io_u **aio_events;
struct io_u **sort_events;
rbd_image_t image;
struct io_u **aio_events;
struct io_u **sort_events;
int fd; /* add for poll */
int fd; /* add for poll */
/* add for poll, init fd: -1 */
rbd->fd = -1;
/* add for poll, init fd: -1 */
rbd->fd = -1;
rbd->aio_events = calloc(td->o.iodepth, sizeof(struct io_u *));
if (!rbd->aio_events)
rbd->aio_events = calloc(td->o.iodepth, sizeof(struct io_u *));
if (!rbd->aio_events)
+#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;
static int _fio_rbd_connect(struct thread_data *td)
{
struct rbd_data *rbd = td->io_ops_data;
-#ifdef CONFIG_RBD_POLL
- /* add for rbd poll */
- rbd->fd = eventfd(0, EFD_NONBLOCK);
- if (rbd->fd < 0) {
- log_err("eventfd failed.\n");
- goto failed_open;
- }
-
- r = rbd_set_image_notification(rbd->image, rbd->fd, EVENT_TYPE_EVENTFD);
- if (r < 0) {
- log_err("rbd_set_image_notification failed.\n");
- goto failed_notify;
- }
-#endif
+ if (!_fio_rbd_setup_poll(rbd))
+ goto failed_poll;
-#ifdef CONFIG_RBD_POLL
-failed_notify:
- close(rbd->fd);
- rbd->fd = -1;
-#endif
-
+failed_poll:
+ rbd_close(rbd->image);
+ rbd->image = NULL;
failed_open:
rados_ioctx_destroy(rbd->io_ctx);
rbd->io_ctx = NULL;
failed_open:
rados_ioctx_destroy(rbd->io_ctx);
rbd->io_ctx = NULL;
close(rbd->fd);
rbd->fd = -1;
}
close(rbd->fd);
rbd->fd = -1;
}
/* shutdown everything */
if (rbd->image) {
/* shutdown everything */
if (rbd->image) {
pfd.events = POLLIN;
ret = poll(&pfd, 1, -1);
pfd.events = POLLIN;
ret = poll(&pfd, 1, -1);
assert(pfd.revents & POLLIN);
event_num = rbd_poll_io_events(rbd->image, comps, min_evts);
assert(pfd.revents & POLLIN);
event_num = rbd_poll_io_events(rbd->image, comps, min_evts);