diff options
| -rw-r--r-- | src/io_uring.c | 27 | ||||
| -rw-r--r-- | src/liburing.h | 22 | ||||
| -rw-r--r-- | test/io_uring-test.c | 13 |
3 files changed, 34 insertions, 28 deletions
diff --git a/src/io_uring.c b/src/io_uring.c index 21ce4f9..a9b6879 100644 --- a/src/io_uring.c +++ b/src/io_uring.c @@ -42,19 +42,19 @@ static int __io_uring_get_completion(int fd, struct io_uring_cq *cq, /* * Return an IO completion, if one is readily available */ -int io_uring_get_completion(int fd, struct io_uring_cq *cq, +int io_uring_get_completion(int fd, struct io_uring *ring, struct io_uring_event **ev_ptr) { - return __io_uring_get_completion(fd, cq, ev_ptr, 0); + return __io_uring_get_completion(fd, &ring->cq, ev_ptr, 0); } /* * Return an IO completion, waiting for it if necessary */ -int io_uring_wait_completion(int fd, struct io_uring_cq *cq, +int io_uring_wait_completion(int fd, struct io_uring *ring, struct io_uring_event **ev_ptr) { - return __io_uring_get_completion(fd, cq, ev_ptr, 1); + return __io_uring_get_completion(fd, &ring->cq, ev_ptr, 1); } /* @@ -62,8 +62,9 @@ int io_uring_wait_completion(int fd, struct io_uring_cq *cq, * * Returns number of iocbs submitted */ -int io_uring_submit(int fd, struct io_uring_sq *sq) +int io_uring_submit(int fd, struct io_uring *ring) { + struct io_uring_sq *sq = &ring->sq; const unsigned mask = *sq->kring_mask; unsigned ktail, ktail_next, submitted; @@ -117,8 +118,9 @@ submit: * * Returns a vacant iocb, or NULL if we're full. */ -struct io_uring_iocb *io_uring_get_iocb(struct io_uring_sq *sq) +struct io_uring_iocb *io_uring_get_iocb(struct io_uring *ring) { + struct io_uring_sq *sq = &ring->sq; unsigned next = sq->iocb_tail + 1; struct io_uring_iocb *iocb; @@ -186,8 +188,7 @@ err: * contain the necessary information to read/write to the rings. */ int io_uring_queue_init(unsigned entries, struct io_uring_params *p, - struct iovec *iovecs, struct io_uring_sq *sq, - struct io_uring_cq *cq) + struct iovec *iovecs, struct io_uring *ring) { int fd; @@ -195,13 +196,15 @@ int io_uring_queue_init(unsigned entries, struct io_uring_params *p, if (fd < 0) return fd; - memset(sq, 0, sizeof(*sq)); - memset(cq, 0, sizeof(*cq)); - return io_uring_mmap(fd, p, sq, cq); + memset(ring, 0, sizeof(*ring)); + return io_uring_mmap(fd, p, &ring->sq, &ring->cq); } -void io_uring_queue_exit(int fd, struct io_uring_sq *sq, struct io_uring_cq *cq) +void io_uring_queue_exit(int fd, struct io_uring *ring) { + struct io_uring_sq *sq = &ring->sq; + struct io_uring_cq *cq = &ring->cq; + munmap(sq->iocbs, *sq->kring_entries * sizeof(struct io_uring_iocb)); munmap(sq->khead, sq->ring_sz); munmap(cq->khead, cq->ring_sz); diff --git a/src/liburing.h b/src/liburing.h index d6589f6..c5bb32e 100644 --- a/src/liburing.h +++ b/src/liburing.h @@ -34,6 +34,11 @@ struct io_uring_cq { size_t ring_sz; }; +struct io_uring { + struct io_uring_sq sq; + struct io_uring_cq cq; +}; + /* * System calls */ @@ -46,20 +51,19 @@ extern int io_uring_enter(unsigned fd, unsigned to_submit, * Library interface */ extern int io_uring_queue_init(unsigned entries, struct io_uring_params *p, - struct iovec *iovecs, struct io_uring_sq *sq, struct io_uring_cq *cq); -extern void io_uring_queue_exit(int fd, struct io_uring_sq *sq, - struct io_uring_cq *cq); -extern int io_uring_get_completion(int fd, struct io_uring_cq *cq, + struct iovec *iovecs, struct io_uring *ring); +extern void io_uring_queue_exit(int fd, struct io_uring *ring); +extern int io_uring_get_completion(int fd, struct io_uring *ring, struct io_uring_event **ev_ptr); -extern int io_uring_wait_completion(int fd, struct io_uring_cq *cq, +extern int io_uring_wait_completion(int fd, struct io_uring *ring, struct io_uring_event **ev_ptr); -extern int io_uring_submit(int fd, struct io_uring_sq *sq); -extern struct io_uring_iocb *io_uring_get_iocb(struct io_uring_sq *sq); +extern int io_uring_submit(int fd, struct io_uring *ring); +extern struct io_uring_iocb *io_uring_get_iocb(struct io_uring *ring); static inline struct io_uring_iocb * -io_uring_iocb_from_ev(struct io_uring_sq *sq, struct io_uring_event *ev) +io_uring_iocb_from_ev(struct io_uring *ring, struct io_uring_event *ev) { - return &sq->iocbs[ev->index]; + return &ring->sq.iocbs[ev->index]; } #endif diff --git a/test/io_uring-test.c b/test/io_uring-test.c index d945f48..1e47a26 100644 --- a/test/io_uring-test.c +++ b/test/io_uring-test.c @@ -14,8 +14,7 @@ int main(int argc, char *argv[]) { struct io_uring_params p; - struct io_uring_sq sq; - struct io_uring_cq cq; + struct io_uring ring; int i, fd, ring_fd, ret, pending, done; struct io_uring_iocb *iocb; struct io_uring_event *ev; @@ -30,7 +29,7 @@ int main(int argc, char *argv[]) memset(&p, 0, sizeof(p)); p.flags = IORING_SETUP_IOPOLL; - ring_fd = io_uring_queue_init(4, &p, NULL, &sq, &cq); + ring_fd = io_uring_queue_init(4, &p, NULL, &ring); if (ring_fd < 0) { fprintf(stderr, "queue_init: %s\n", strerror(-ring_fd)); return 1; @@ -47,7 +46,7 @@ int main(int argc, char *argv[]) offset = 0; do { - iocb = io_uring_get_iocb(&sq); + iocb = io_uring_get_iocb(&ring); if (!iocb) break; iocb->opcode = IORING_OP_READ; @@ -60,7 +59,7 @@ int main(int argc, char *argv[]) offset += 4096; } while (1); - ret = io_uring_submit(ring_fd, &sq); + ret = io_uring_submit(ring_fd, &ring); if (ret < 0) { fprintf(stderr, "io_uring_submit: %s\n", strerror(-ret)); return 1; @@ -70,7 +69,7 @@ int main(int argc, char *argv[]) pending = ret; for (i = 0; i < pending; i++) { ev = NULL; - ret = io_uring_get_completion(ring_fd, &cq, &ev); + ret = io_uring_get_completion(ring_fd, &ring, &ev); if (ret < 0) { fprintf(stderr, "io_uring_get_completion: %s\n", strerror(-ret)); return 1; @@ -85,6 +84,6 @@ int main(int argc, char *argv[]) printf("Submitted=%d, completed=%d\n", pending, done); close(fd); - io_uring_queue_exit(ring_fd, &sq, &cq); + io_uring_queue_exit(ring_fd, &ring); return 0; } |