From: Pavel Begunkov <asml.silence@gmail.com>
To: Jens Axboe <axboe@kernel.dk>, io-uring@vger.kernel.org
Subject: [PATCH liburing 1/2] tests: improve multicqe_drain
Date: Fri, 24 Sep 2021 20:05:16 +0100 [thread overview]
Message-ID: <3ab7e2b2e52dba8dff11253b2b7ea3f57074c24e.1632507515.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1632507515.git.asml.silence@gmail.com>
Small improvements for multicqe_drain test.
- close pipes
- use a helper for multishot poll
- don't touch cqe after io_uring_cqe_seen()
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
test/multicqes_drain.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/test/multicqes_drain.c b/test/multicqes_drain.c
index d04cf37..b107a48 100644
--- a/test/multicqes_drain.c
+++ b/test/multicqes_drain.c
@@ -288,9 +288,9 @@ static int test_simple_drain(struct io_uring *ring)
}
}
- io_uring_prep_poll_add(sqe[0], pipe1[0], POLLIN);
- sqe[0]->len |= IORING_POLL_ADD_MULTI;
+ io_uring_prep_poll_multishot(sqe[0], pipe1[0], POLLIN);
sqe[0]->user_data = 0;
+
io_uring_prep_poll_add(sqe[1], pipe2[0], POLLIN);
sqe[1]->user_data = 1;
@@ -320,6 +320,7 @@ static int test_simple_drain(struct io_uring *ring)
io_uring_prep_poll_remove(sqe[0], 0);
sqe[0]->user_data = 2;
+
io_uring_prep_nop(sqe[1]);
sqe[1]->flags |= IOSQE_IO_DRAIN;
sqe[1]->user_data = 3;
@@ -333,18 +334,21 @@ static int test_simple_drain(struct io_uring *ring)
goto err;
}
-
for (i = 0; i < 6; i++) {
ret = io_uring_wait_cqe(ring, &cqe);
if (ret < 0) {
printf("wait completion %d\n", ret);
goto err;
}
- io_uring_cqe_seen(ring, cqe);
if ((i == 5) && (cqe->user_data != 3))
goto err;
+ io_uring_cqe_seen(ring, cqe);
}
+ close(pipe1[0]);
+ close(pipe1[1]);
+ close(pipe2[0]);
+ close(pipe2[1]);
return 0;
err:
return 1;
--
2.33.0
next prev parent reply other threads:[~2021-09-24 19:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 19:05 [PATCH liburing 0/2] small test improvements Pavel Begunkov
2021-09-24 19:05 ` Pavel Begunkov [this message]
2021-09-24 19:05 ` [PATCH liburing 2/2] tests: match kernel and pass fds in s32[] Pavel Begunkov
2021-09-24 19:59 ` [PATCH liburing 0/2] small test improvements Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3ab7e2b2e52dba8dff11253b2b7ea3f57074c24e.1632507515.git.asml.silence@gmail.com \
--to=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.