queue, liburing.h: Avoid `io_uring_get_sqe()` code duplication
PATCH 1/1 queue, liburing.h: Avoid `io_uring_get_sqe()` code duplication
Since commit 8be8af4afcb4909104c ("queue: provide io_uring_get_sqe() symbol again"), we have the same defintion of io_uring_get_sqe() in queue.c and liburing.h.
Make it simpler, maintain it in a single place, create a new static inline function wrapper with name _io_uring_get_sqe(). Then tail call both io_uring_get_sqe() functions to _io_uring_get_sqe().
--- src/include/liburing.h | 9 +++++++-- src/queue.c | 11 +---------- 2 files changed, 8 insertions(+), 12 deletions(-)
src/include/liburing.h +7 -2
@@ -831,8 +831,7 @@ static inline int io_uring_wait_cqe(struct io_uring *ring,* * Returns a vacant sqe, or NULL if we're full. */ -#ifndef LIBURING_INTERNAL -static inline struct io_uring_sqe *io_uring_get_sqe (struct io_uring *ring) +static inline struct io_uring_sqe *_io_uring_get_sqe (struct io_uring *ring) {struct io_uring_sq *sq = &ring->sq;unsigned int head =io_uring_smp_load_acquire (sq->khead);
@@ -845,6 +844,12 @@ static inline struct io_uring_sqe *io_uring_get_sqe(struct io_uring *ring) }return sqe; } + +#ifndef LIBURING_INTERNAL +static inline struct io_uring_sqe *io_uring_get_sqe (struct io_uring *ring) +{ +return _io_uring_get_sqe (ring); +}#else struct io_uring_sqe *io_uring_get_sqe (struct io_uring *ring);#endif
src/queue.c +1 -10
@@ -405,16 +405,7 @@ int io_uring_submit_and_wait(struct io_uring *ring, unsigned wait_nr)struct io_uring_sqe *io_uring_get_sqe (struct io_uring *ring) { -struct io_uring_sq *sq = &ring->sq; -unsigned int head =io_uring_smp_load_acquire (sq->khead); -unsigned int next = sq->sqe_tail +1 ; -struct io_uring_sqe *sqe =NULL ; - -if (next - head <= *sq->kring_entries) { - sqe = &sq->sqes[sq->sqe_tail & *sq->kring_mask]; - sq->sqe_tail = next; - } -return sqe; +return _io_uring_get_sqe (ring); }int __io_uring_sqring_wait (struct io_uring *ring)
base-commit: 896a1d3ab14a8777a45db6e7b67cf557a44923fb
Signature · 1 line
2.32.0
Quoted 3 lines · Ammar Faizi
Since commit
8be8af4afcb4909104c("queue: provideio_uring_get_sqe()symbol again"), we have the same defintion ofio_uring_get_sqe()in
Typo
/s/defintion/definition/
with that fixed
Quoted 6 lines
queue.candliburing.h.Make it simpler, maintain it in a single place, create a new static inline function wrapper with name
_io_uring_get_sqe(). Then tail call bothio_uring_get_sqe()functions to_io_uring_get_sqe().
Also, I tested this, the fpos test failed. Maybe it needs the recent kernel fixes? So I assume everything is fine.
Tests timed out: <rsrc_tags>
Tests failed: <fpos>
[viro@freezing ~/liburing]$ test/fpos
inconsistent reads, got 0s:8192 1s:6144
f_pos incorrect, expected 14336 have 7
failed read async=0 blocksize=7
-- Viro
Quoted 25 lines · Alviro Iskandar Setiawan
Quoted 3 lines · Ammar Faizi
Since commit
8be8af4afcb4909104c("queue: provideio_uring_get_sqe()symbol again"), we have the same defintion ofio_uring_get_sqe()inTypo
/s/defintion/definition/with that fixed
Reviewed-by Alviro Iskandar Setiawan <[email protected]>Quoted 6 lines
queue.candliburing.h.Make it simpler, maintain it in a single place, create a new static inline function wrapper with name
_io_uring_get_sqe(). Then tail call bothio_uring_get_sqe()functions to_io_uring_get_sqe().Also, I tested this, the fpos test failed. Maybe it needs the recent kernel fixes? So I assume everything is fine.
Tests timed out: <
rsrc_tags>
Tests failed: <fpos>
Quoted 6 lines
[viro@freezing ~/liburing]$ test/fpos
inconsistent reads, got 0s:8192 1s:6144
f_posincorrect, expected 14336 have 7
failed read async=0 blocksize=7
Thanks for reviewing and testing. I will fix it and append those tags and in the v2.
Signature · 1 line
Ammar Faizi