From 3ceb15c1327e6bb6105a0dec97421308e5567f02 Mon Sep 17 00:00:00 2001 From: Jeff Moyer Date: Fri, 8 Feb 2019 13:32:21 -0500 Subject: Add sigmask parameter to io_uring_enter Update liburing and io_uring_enter.2 to match the kernel. Signed-off-by: Jeff Moyer Signed-off-by: Jens Axboe --- src/liburing.h | 3 ++- src/queue.c | 4 ++-- src/syscall.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/liburing.h b/src/liburing.h index 9917b5b..9c8c13e 100644 --- a/src/liburing.h +++ b/src/liburing.h @@ -2,6 +2,7 @@ #define LIB_URING_H #include +#include #include "compat.h" #include "io_uring.h" @@ -46,7 +47,7 @@ struct io_uring { */ extern int io_uring_setup(unsigned entries, struct io_uring_params *p); extern int io_uring_enter(unsigned fd, unsigned to_submit, - unsigned min_complete, unsigned flags); + unsigned min_complete, unsigned flags, sigset_t *sig, size_t sigsz); extern int io_uring_register(int fd, unsigned int opcode, void *arg, unsigned int nr_args); diff --git a/src/queue.c b/src/queue.c index b8788b3..f2b73a4 100644 --- a/src/queue.c +++ b/src/queue.c @@ -29,7 +29,7 @@ static int __io_uring_get_completion(struct io_uring *ring, if (!wait) break; ret = io_uring_enter(ring->ring_fd, 0, 1, - IORING_ENTER_GETEVENTS); + IORING_ENTER_GETEVENTS, NULL, _NSIG / 8); if (ret < 0) return -errno; } while (1); @@ -112,7 +112,7 @@ int io_uring_submit(struct io_uring *ring) submit: return io_uring_enter(ring->ring_fd, submitted, 0, - IORING_ENTER_GETEVENTS); + IORING_ENTER_GETEVENTS, NULL, _NSIG / 8); } /* diff --git a/src/syscall.c b/src/syscall.c index a9e648e..aa82c3b 100644 --- a/src/syscall.c +++ b/src/syscall.c @@ -33,8 +33,8 @@ int io_uring_setup(unsigned int entries, struct io_uring_params *p) } int io_uring_enter(int fd, unsigned int to_submit, unsigned int min_complete, - unsigned int flags) + unsigned int flags, sigset_t *sig, size_t sigsz) { return syscall(__NR_sys_io_uring_enter, fd, to_submit, min_complete, - flags, NULL, 0); + flags, sig, sigsz); } -- cgit