Make the directio tests work with libcheck_pending() being separate from
libcheck_check
Reviewed-by: Martin Wilck <mwilck@xxxxxxxx>
Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
---
tests/directio.c | 133 +++++++++++++++++++++++++++++------------------
1 file changed, 82 insertions(+), 51 deletions(-)
diff --git a/tests/directio.c b/tests/directio.c
index 763929e5..2e22f831 100644
--- a/tests/directio.c
+++ b/tests/directio.c
@@ -219,13 +219,22 @@ static void return_io_getevents_nr(struct timespec *ts, int nr,
ev_off += i;
}
-void do_check_state(struct checker *c, int sync, int timeout, int chk_state)
+void do_check_state(struct checker *c, int sync, int chk_state)
{
struct directio_context * ct = (struct directio_context *)c->context;
if (!ct->running)
will_return(__wrap_io_submit, 1);
- assert_int_equal(check_state(test_fd, ct, sync, timeout), chk_state);
+ assert_int_equal(check_state(test_fd, ct, sync, c->timeout), chk_state);
+ if (sync) {
+ assert_int_equal(ev_off, 0);
+ memset(mock_events, 0, sizeof(mock_events));
+ }
+}
+
+void do_libcheck_pending(struct checker *c, int chk_state)
+{
+ assert_int_equal(libcheck_pending(c), chk_state);
assert_int_equal(ev_off, 0);
memset(mock_events, 0, sizeof(mock_events));
}
@@ -245,12 +254,13 @@ void do_libcheck_reset(int nr_aio_grps)
assert_int_equal(ioctx_count, 0);
}
-static void do_libcheck_init(struct checker *c, int blocksize,
+static void do_libcheck_init(struct checker *c, int blocksize, int timeout,
struct async_req **req)
{
struct directio_context * ct;
c->fd = test_fd;
+ c->timeout = timeout;
wrap_will_return(WRAP_IOCTL, blocksize);
assert_int_equal(libcheck_init(c), 0);
ct = (struct directio_context *)c->context;
@@ -305,7 +315,7 @@ static void test_init_reset_init(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
- do_libcheck_init(&c, 4096, NULL);
+ do_libcheck_init(&c, 4096, 0, NULL);
aio_grp = get_aio_grp(&c);
check_aio_grp(aio_grp, 1, 0);
list_for_each_entry(tmp_grp, &aio_grp_list, node)
@@ -314,7 +324,7 @@ static void test_init_reset_init(void **state)
check_aio_grp(aio_grp, 0, 0);
do_libcheck_reset(1);
will_return(__wrap_io_setup, 0);
- do_libcheck_init(&c, 4096, NULL);
+ do_libcheck_init(&c, 4096, 0, NULL);
aio_grp = get_aio_grp(&c);
check_aio_grp(aio_grp, 1, 0);
list_for_each_entry(tmp_grp, &aio_grp_list, node)
@@ -340,11 +350,11 @@ static void test_init_free(void **state)
struct directio_context * ct;
if (i % 3 == 0)
- do_libcheck_init(&c[i], 512, NULL);
+ do_libcheck_init(&c[i], 512, 0, NULL);
else if (i % 3 == 1)
- do_libcheck_init(&c[i], 1024, NULL);
+ do_libcheck_init(&c[i], 1024, 0, NULL);
else
- do_libcheck_init(&c[i], 4096, NULL);
+ do_libcheck_init(&c[i], 4096, 0, NULL);
ct = (struct directio_context *)c[i].context;
assert_non_null(ct->aio_grp);
if ((i & 1023) == 0)
@@ -385,7 +395,7 @@ static void test_multi_init_free(void **state)
for (count = 0, i = 0; i < 4096; count++) {
/* usually init, but occasionally free checkers */
if (count == 0 || (count % 5 != 0 && count % 7 != 0)) {
- do_libcheck_init(&c[i], 4096, NULL);
+ do_libcheck_init(&c[i], 4096, 0, NULL);
i++;
} else {
i--;
@@ -404,7 +414,7 @@ static void test_multi_init_free(void **state)
i--;
libcheck_free(&c[i]);
} else {
- do_libcheck_init(&c[i], 4096, NULL);
+ do_libcheck_init(&c[i], 4096, 0, NULL);
i++;
}
}
@@ -420,9 +430,9 @@ static void test_check_state_simple(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
- do_libcheck_init(&c, 4096, &req);
+ do_libcheck_init(&c, 4096, 30, &req);
return_io_getevents_nr(NULL, 1, &req, &res);
- do_check_state(&c, 1, 30, PATH_UP);
+ do_check_state(&c, 1, PATH_UP);
libcheck_free(&c);
do_libcheck_reset(1);
}
@@ -435,10 +445,10 @@ static void test_check_state_timeout(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
- do_libcheck_init(&c, 4096, NULL);
+ do_libcheck_init(&c, 4096, 30, NULL);
aio_grp = get_aio_grp(&c);
return_io_getevents_none();
- do_check_state(&c, 1, 30, PATH_DOWN);
+ do_check_state(&c, 1, PATH_DOWN);
check_aio_grp(aio_grp, 1, 0);
libcheck_free(&c);
do_libcheck_reset(1);
@@ -452,16 +462,20 @@ static void test_check_state_async_timeout(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
- do_libcheck_init(&c, 4096, NULL);
+ do_libcheck_init(&c, 4096, 3, NULL);
aio_grp = get_aio_grp(&c);
+ do_check_state(&c, 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c, 0, 3, PATH_PENDING);
+ do_libcheck_pending(&c, PATH_PENDING);
+ do_check_state(&c, 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c, 0, 3, PATH_PENDING);
+ do_libcheck_pending(&c, PATH_PENDING);
+ do_check_state(&c, 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c, 0, 3, PATH_PENDING);
+ do_libcheck_pending(&c, PATH_PENDING);
+ do_check_state(&c, 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c, 0, 3, PATH_DOWN);
+ do_libcheck_pending(&c, PATH_DOWN);
check_aio_grp(aio_grp, 1, 0);
libcheck_free(&c);
do_libcheck_reset(1);
@@ -477,14 +491,16 @@ static void test_free_with_pending(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
- do_libcheck_init(&c[0], 4096, &req);
- do_libcheck_init(&c[1], 4096, NULL);
+ do_libcheck_init(&c[0], 4096, 30, &req);
+ do_libcheck_init(&c[1], 4096, 30, NULL);
aio_grp = get_aio_grp(c);
+ do_check_state(&c[0], 0, PATH_PENDING);
+ do_check_state(&c[1], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[0], 0, 30, PATH_PENDING);
+ do_libcheck_pending(&c[0], PATH_PENDING);
return_io_getevents_nr(NULL, 1, &req, &res);
return_io_getevents_none();
- do_check_state(&c[1], 0, 30, PATH_PENDING);
+ do_libcheck_pending(&c[1], PATH_PENDING);
assert_true(is_checker_running(&c[0]));
assert_true(is_checker_running(&c[1]));
check_aio_grp(aio_grp, 2, 0);
@@ -505,9 +521,10 @@ static void test_orphaned_aio_group(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
for (i = 0; i < AIO_GROUP_SIZE; i++) {
- do_libcheck_init(&c[i], 4096, NULL);
+ do_libcheck_init(&c[i], 4096, 30, NULL);
+ do_check_state(&c[i], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[i], 0, 30, PATH_PENDING);
+ do_libcheck_pending(&c[i], PATH_PENDING);
}
aio_grp = get_aio_grp(c);
check_aio_grp(aio_grp, AIO_GROUP_SIZE, 0);
@@ -539,19 +556,19 @@ static void test_timeout_cancel_failed(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
for (i = 0; i < 2; i++)
- do_libcheck_init(&c[i], 4096, &reqs[i]);
+ do_libcheck_init(&c[i], 4096, 30, &reqs[i]);
aio_grp = get_aio_grp(c);
return_io_getevents_none();
- do_check_state(&c[0], 1, 30, PATH_DOWN);
+ do_check_state(&c[0], 1, PATH_DOWN);
assert_true(is_checker_running(&c[0]));
check_aio_grp(aio_grp, 2, 0);
return_io_getevents_none();
- do_check_state(&c[0], 1, 30, PATH_DOWN);
+ do_check_state(&c[0], 1, PATH_DOWN);
assert_true(is_checker_running(&c[0]));
return_io_getevents_nr(NULL, 1, &reqs[0], &res[0]);
return_io_getevents_nr(NULL, 1, &reqs[1], &res[1]);
- do_check_state(&c[1], 1, 30, PATH_UP);
- do_check_state(&c[0], 1, 30, PATH_UP);
+ do_check_state(&c[1], 1, PATH_UP);
+ do_check_state(&c[0], 1, PATH_UP);
for (i = 0; i < 2; i++) {
assert_false(is_checker_running(&c[i]));
libcheck_free(&c[i]);
@@ -571,28 +588,37 @@ static void test_async_timeout_cancel_failed(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
for (i = 0; i < 2; i++)
- do_libcheck_init(&c[i], 4096, &reqs[i]);
+ do_libcheck_init(&c[i], 4096, 2, &reqs[i]);
+ do_check_state(&c[0], 0, PATH_PENDING);
+ do_check_state(&c[1], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[0], 0, 2, PATH_PENDING);
+ do_libcheck_pending(&c[0], PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[1], 0, 2, PATH_PENDING);
+ do_libcheck_pending(&c[1], PATH_PENDING);
+ do_check_state(&c[0], 0, PATH_PENDING);
+ do_check_state(&c[1], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[0], 0, 2, PATH_PENDING);
+ do_libcheck_pending(&c[0], PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[1], 0, 2, PATH_PENDING);
+ do_libcheck_pending(&c[1], PATH_PENDING);
+ do_check_state(&c[0], 0, PATH_PENDING);
+ do_check_state(&c[1], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[0], 0, 2, PATH_DOWN);
+ do_libcheck_pending(&c[0], PATH_DOWN);
if (!test_dev) {
/* can't pick which even gets returned on real devices */
return_io_getevents_nr(NULL, 1, &reqs[1], &res[1]);
- do_check_state(&c[1], 0, 2, PATH_UP);
+ do_libcheck_pending(&c[1], PATH_UP);
}
+ do_check_state(&c[0], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[0], 0, 2, PATH_DOWN);
+ do_libcheck_pending(&c[0], PATH_DOWN);
assert_true(is_checker_running(&c[0]));
+ do_check_state(&c[1], 0, PATH_PENDING);
+ do_check_state(&c[0], 0, PATH_PENDING);
return_io_getevents_nr(NULL, 2, reqs, res);
- do_check_state(&c[1], 0, 2, PATH_UP);
- do_check_state(&c[0], 0, 2, PATH_UP);
+ do_libcheck_pending(&c[1], PATH_UP);
+ do_libcheck_pending(&c[0], PATH_UP);
for (i = 0; i < 2; i++) {
assert_false(is_checker_running(&c[i]));
libcheck_free(&c[i]);
@@ -612,15 +638,17 @@ static void test_orphan_checker_cleanup(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
for (i = 0; i < 2; i++)
- do_libcheck_init(&c[i], 4096, &reqs[i]);
+ do_libcheck_init(&c[i], 4096, 30, &reqs[i]);
aio_grp = get_aio_grp(c);
+ do_check_state(&c[0], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[0], 0, 30, PATH_PENDING);
+ do_libcheck_pending(&c[0], PATH_PENDING);
check_aio_grp(aio_grp, 2, 0);
libcheck_free(&c[0]);
check_aio_grp(aio_grp, 2, 1);
+ do_check_state(&c[1], 0, PATH_PENDING);
return_io_getevents_nr(NULL, 2, reqs, res);
- do_check_state(&c[1], 0, 2, PATH_UP);
+ do_libcheck_pending(&c[1], PATH_UP);
check_aio_grp(aio_grp, 1, 0);
libcheck_free(&c[1]);
check_aio_grp(aio_grp, 0, 0);
@@ -636,10 +664,11 @@ static void test_orphan_reset_cleanup(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
- do_libcheck_init(&c, 4096, NULL);
+ do_libcheck_init(&c, 4096, 30, NULL);
orphan_aio_grp = get_aio_grp(&c);
+ do_check_state(&c, 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c, 0, 30, PATH_PENDING);
+ do_libcheck_pending(&c, PATH_PENDING);
check_aio_grp(orphan_aio_grp, 1, 0);
libcheck_free(&c);
check_aio_grp(orphan_aio_grp, 1, 1);
@@ -671,10 +700,10 @@ static void test_check_state_blksize(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
for (i = 0; i < 3; i++)
- do_libcheck_init(&c[i], blksize[i], &reqs[i]);
+ do_libcheck_init(&c[i], blksize[i], 30, &reqs[i]);
for (i = 0; i < 3; i++) {
return_io_getevents_nr(NULL, 1, &reqs[i], &res[i]);
- do_check_state(&c[i], 1, 30, chk_state[i]);
+ do_check_state(&c[i], 1, chk_state[i]);
}
for (i = 0; i < 3; i++) {
assert_false(is_checker_running(&c[i]));
@@ -695,19 +724,21 @@ static void test_check_state_async(void **state)
assert_true(list_empty(&aio_grp_list));
will_return(__wrap_io_setup, 0);
for (i = 0; i < 257; i++)
- do_libcheck_init(&c[i], 4096, &reqs[i]);
+ do_libcheck_init(&c[i], 4096, 30, &reqs[i]);
for (i = 0; i < 256; i++) {
+ do_check_state(&c[i], 0, PATH_PENDING);
return_io_getevents_none();
- do_check_state(&c[i], 0, 30, PATH_PENDING);
+ do_libcheck_pending(&c[i], PATH_PENDING);
assert_true(is_checker_running(&c[i]));
}
+ do_check_state(&c[256], 0, PATH_PENDING);
return_io_getevents_nr(&full_timeout, 256, reqs, res);
return_io_getevents_nr(NULL, 1, &reqs[256], &res[256]);
- do_check_state(&c[256], 0, 30, PATH_UP);
+ do_libcheck_pending(&c[256], PATH_UP);
assert_false(is_checker_running(&c[256]));
libcheck_free(&c[256]);
for (i = 0; i < 256; i++) {
- do_check_state(&c[i], 0, 30, PATH_UP);
+ do_check_state(&c[i], 0, PATH_UP);
assert_false(is_checker_running(&c[i]));
libcheck_free(&c[i]);
}
--
2.45.0
