tests: add another timeout sequence test case
PATCH 1/1 tests: add another timeout sequence test case
This test case catches an issue where timeouts may not be flushed if the number of new events is greater (not equal) to the number of events requested in the timeout.
Signed-off-by Marcelo Diop-Gonzalez <[email protected]>
--- test/timeout.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
test/timeout.c +17 -9
@@ -112,7 +112,7 @@ err:/* * Test numbered trigger of timeout */ -static int test_single_timeout_nr (struct io_uring *ring) +static int test_single_timeout_nr (struct io_uring *ring,int nr) {struct io_uring_cqe *cqe;struct io_uring_sqe *sqe;
@@ -126,7 +126,7 @@ static int test_single_timeout_nr(struct io_uring *ring) }msec_to_ts (&ts,TIMEOUT_MSEC ); -io_uring_prep_timeout (sqe, &ts,2 ,0 ); +io_uring_prep_timeout (sqe, &ts, nr,0 ); sqe =io_uring_get_sqe (ring);io_uring_prep_nop (sqe);
@@ -149,6 +149,8 @@ static int test_single_timeout_nr(struct io_uring *ring) goto err; } + ret = cqe->res; +/* * NOP commands have user_data as 1. Check that we get the * two NOPs first, then the successfully removed timout as
@@ -167,15 +169,16 @@ static int test_single_timeout_nr(struct io_uring *ring)fprintf (stderr,"%s: timeout not last\n" , __FUNCTION__); goto err; } +if (ret) { +fprintf (stderr,"%s: timeout triggered by passage of" +" time, not by events completed\n" , __FUNCTION__); + goto err; + }break ; } - ret = cqe->res;io_uring_cqe_seen (ring, cqe); -if (ret <0 ) { -fprintf (stderr,"Timeout: %s\n" ,strerror (-ret)); - goto err; - }else if (ret) { +if (ret) {fprintf (stderr,"res: %d\n" , ret); goto err; }
@@ -1224,9 +1227,14 @@ int main(int argc, char *argv[])return ret; } - ret =test_single_timeout_nr (&ring); + ret =test_single_timeout_nr (&ring,1 ); +if (ret) { +fprintf (stderr,"test_single_timeout_nr(1) failed\n" ); +return ret; + } + ret =test_single_timeout_nr (&ring,2 );if (ret) { -fprintf (stderr,"test_single_timeout_nr failed\n" ); +fprintf (stderr,"test_single_timeout_nr(2) failed\n" );return ret; }
Signature · 1 line
2.20.1
Quoted 41 lines · Marcelo Diop-Gonzalez
This test case catches an issue where timeouts may not be flushed if the number of new events is greater (not equal) to the number of events requested in the timeout.
Signed-off-by Marcelo Diop-Gonzalez <[email protected]>--- test/timeout.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)test/timeout.c +4
-2@@ -112,7 +112,7 @@ err:/* * Test numbered trigger of timeout */ -static int test_single_timeout_nr (struct io_uring *ring) +static int test_single_timeout_nr (struct io_uring *ring,int nr) {struct io_uring_cqe *cqe;struct io_uring_sqe *sqe;@@ -126,7 +126,7 @@ static int test_single_timeout_nr(struct io_uring *ring) }msec_to_ts (&ts,TIMEOUT_MSEC ); -io_uring_prep_timeout (sqe, &ts,2 ,0 ); +io_uring_prep_timeout (sqe, &ts, nr,0 ); sqe =io_uring_get_sqe (ring);io_uring_prep_nop (sqe);@@ -149,6 +149,8 @@ static int test_single_timeout_nr(struct io_uring *ring) goto err; } + ret = cqe->res; +/* * NOP commands have user_data as 1. Check that we get the * two NOPs first, then the successfully removed timout as
test/timeout.c static int test_single_timeout_nr(struct io_uring *ring) · line 171
Quoted 3 lines
test/timeout.c +0
-0@@ -167,15 +169,16 @@ static int test_single_timeout_nr(struct io_uring *ring)fprintf (stderr,"%s: timeout not last\n" , __FUNCTION__); goto err; }
Ahh wait actually I don't like it so much because this assumes the timeout has to be the last one in the ring even when nr = 1. Happens to be true but doesn't seem like something the test should require in that case. I'll send a v2 later.
-Marcelo
Quoted 38 lines
test/timeout.c +13
-7+if (ret) { +fprintf (stderr,"%s: timeout triggered by passage of" +" time, not by events completed\n" , __FUNCTION__); + goto err; + }break ; } - ret = cqe->res;io_uring_cqe_seen (ring, cqe); -if (ret <0 ) { -fprintf (stderr,"Timeout: %s\n" ,strerror (-ret)); - goto err; - }else if (ret) { +if (ret) {fprintf (stderr,"res: %d\n" , ret); goto err; }@@ -1224,9 +1227,14 @@ int main(int argc, char *argv[])return ret; } - ret =test_single_timeout_nr (&ring); + ret =test_single_timeout_nr (&ring,1 ); +if (ret) { +fprintf (stderr,"test_single_timeout_nr(1) failed\n" ); +return ret; + } + ret =test_single_timeout_nr (&ring,2 );if (ret) { -fprintf (stderr,"test_single_timeout_nr failed\n" ); +fprintf (stderr,"test_single_timeout_nr(2) failed\n" );return ret; }Signature · 1 line
2.20.1