From: Jiufei Xue <[email protected]>
To: [email protected]
Cc: [email protected], [email protected],
Jiufei Xue <[email protected]>
Subject: [PATCH liburing v2 2/2] test/timeout: add testcase for new timeout feature
Date: Tue, 4 Aug 2020 17:21:53 +0800 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Signed-off-by: Jiufei Xue <[email protected]>
---
test/Makefile | 1 +
test/timeout.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 98 insertions(+)
diff --git a/test/Makefile b/test/Makefile
index a693d6f..8892ee9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -89,6 +89,7 @@ submit-reuse: XCFLAGS = -lpthread
poll-v-poll: XCFLAGS = -lpthread
across-fork: XCFLAGS = -lpthread
ce593a6c480a-test: XCFLAGS = -lpthread
+timeout: XCFLAGS = -lpthread
install: $(all_targets) runtests.sh runtests-loop.sh
$(INSTALL) -D -d -m 755 $(datadir)/liburing-test/
diff --git a/test/timeout.c b/test/timeout.c
index 7e9f11d..008acc5 100644
--- a/test/timeout.c
+++ b/test/timeout.c
@@ -10,6 +10,7 @@
#include <string.h>
#include <fcntl.h>
#include <sys/time.h>
+#include <pthread.h>
#include "liburing.h"
#include "../src/syscall.h"
@@ -18,6 +19,11 @@
static int not_supported;
static int no_modify;
+struct thread_data {
+ struct io_uring *ring;
+ volatile int do_exit;
+};
+
static void msec_to_ts(struct __kernel_timespec *ts, unsigned int msec)
{
ts->tv_sec = msec / 1000;
@@ -232,6 +238,91 @@ err:
return 1;
}
+static void *test_reap_thread_fn(void *__data)
+{
+ struct thread_data *data = __data;
+ struct io_uring *ring = (struct io_uring *)data->ring;
+ struct io_uring_cqe *cqe;
+ struct __kernel_timespec ts;
+ int ret, i = 0;
+
+ msec_to_ts(&ts, TIMEOUT_MSEC);
+ while (!data->do_exit) {
+ ret = io_uring_wait_cqes(ring, &cqe, 2, &ts, NULL);
+ if (ret == -ETIME) {
+ if (i == 2)
+ break;
+ else
+ continue;
+ } else if (ret < 0) {
+ fprintf(stderr, "%s: wait timeout failed: %d\n", __FUNCTION__, ret);
+ goto err;
+ }
+ ret = cqe->res;
+ if (ret < 0) {
+ fprintf(stderr, "res: %d\n", ret);
+ goto err;
+ }
+
+ io_uring_cqe_seen(ring, cqe);
+ i++;
+ }
+
+ if (i != 2) {
+ fprintf(stderr, "got %d completions\n", i);
+ ret = 1;
+ goto err;
+ }
+ return NULL;
+
+err:
+ return (void *)(intptr_t)ret;
+}
+
+static int test_single_timeout_wait_new(struct io_uring *ring)
+{
+ struct thread_data data;
+ struct io_uring_sqe *sqe;
+ pthread_t reap_thread;
+ int ret;
+ void *retval;
+
+ if (!(ring->features & IORING_FEAT_GETEVENTS_TIMEOUT)) {
+ fprintf(stdout, "feature IORING_FEAT_GETEVENTS_TIMEOUT not supported.\n");
+ return 0;
+ }
+ if (io_uring_set_cqwait_timeout(ring)) {
+ fprintf(stdout, "o_uring_set_cqwait_timeout failed.\n");
+ return 1;
+ }
+
+ data.ring = ring;
+ data.do_exit = 0;
+
+ sqe = io_uring_get_sqe(ring);
+ io_uring_prep_nop(sqe);
+ io_uring_sqe_set_data(sqe, (void *) 1);
+
+ sqe = io_uring_get_sqe(ring);
+ io_uring_prep_nop(sqe);
+ io_uring_sqe_set_data(sqe, (void *) 1);
+
+ pthread_create(&reap_thread, NULL, test_reap_thread_fn, &data);
+
+ ret = io_uring_submit(ring);
+ if (ret <= 0) {
+ fprintf(stderr, "%s: sqe submit failed: %d\n", __FUNCTION__, ret);
+ goto err;
+ }
+
+ sleep(1);
+ data.do_exit = 1;
+ pthread_join(reap_thread, &retval);
+ return (int)(intptr_t)retval;
+err:
+ return 1;
+}
+
/*
* Test single timeout waking us up
*/
@@ -1054,6 +1145,12 @@ int main(int argc, char *argv[])
return ret;
}
+ ret = test_single_timeout_wait_new(&ring);
+ if (ret) {
+ fprintf(stderr, "test_single_timeout_wait_new failed\n");
+ return ret;
+ }
+
/*
* this test must go last, it kills the ring
*/
--
1.8.3.1
prev parent reply other threads:[~2020-08-04 9:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 9:21 [PATCH liburing v2 0/2] add support for new timeout feature Jiufei Xue
2020-08-04 9:21 ` [PATCH liburing v2 1/2] io_uring_enter: add timeout support Jiufei Xue
2020-08-04 10:25 ` Stefan Metzmacher
2020-08-05 1:08 ` Jiufei Xue
2020-08-05 1:43 ` Jens Axboe
2020-08-05 2:00 ` Jiufei Xue
2020-08-04 9:21 ` Jiufei Xue [this message]
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=1596532913-70757-3-git-send-email-jiufei.xue@linux.alibaba.com \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox