ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ut/thread: Fix bugs in test case for_each_channel_remove()

Browse Source 
The test case for_each_channel_remove() did not have any
assertion and the count was not incremented correctly.

This patch fixes several issues in for_each_channel_remove()
by counting spdk_get/put_io_channel() and spdk_for_each_channel()
correctly and achieves what we wanted to do in this test case.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Iceffd924f8887452bd7dad48e30d121874ab0b05
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/483
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-01-27 23:36:40 -05:00 committed by Tomasz Zawadzki
parent 644e6420d1
commit f2576eb05b
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
test/unit/lib/thread/thread.c/thread_ut.c
View File

@ -383,45 +383,53 @@ thread_for_each(void)
static int static int
channel_create(void *io_device, void *ctx_buf) channel_create(void *io_device, void *ctx_buf)
{ {
int *ch_count = io_device;
(*ch_count)++;
return 0; return 0;
} }
static void static void
channel_destroy(void *io_device, void *ctx_buf) channel_destroy(void *io_device, void *ctx_buf)
{ {
int *ch_count = io_device;
(*ch_count)--;
} }
static void static void
channel_msg(struct spdk_io_channel_iter *i) channel_msg(struct spdk_io_channel_iter *i)
{ {
struct spdk_io_channel *ch = spdk_io_channel_iter_get_channel(i); int *msg_count = spdk_io_channel_iter_get_ctx(i);
int *count = spdk_io_channel_get_ctx(ch);
(*count)++;
(*msg_count)++;
spdk_for_each_channel_continue(i, 0); spdk_for_each_channel_continue(i, 0);
} }
static void static void
channel_cpl(struct spdk_io_channel_iter *i, int status) channel_cpl(struct spdk_io_channel_iter *i, int status)
{ {
int *msg_count = spdk_io_channel_iter_get_ctx(i);
(*msg_count)++;
} }
static void static void
for_each_channel_remove(void) for_each_channel_remove(void)
{ {
struct spdk_io_channel *ch0, *ch1, *ch2; struct spdk_io_channel *ch0, *ch1, *ch2;
int io_target; int ch_count = 0;
int count = 0; int msg_count = 0;
allocate_threads(3); allocate_threads(3);
set_thread(0); set_thread(0);
spdk_io_device_register(&io_target, channel_create, channel_destroy, sizeof(int), NULL); spdk_io_device_register(&ch_count, channel_create, channel_destroy, sizeof(int), NULL);
ch0 = spdk_get_io_channel(&io_target); ch0 = spdk_get_io_channel(&ch_count);
set_thread(1); set_thread(1);
ch1 = spdk_get_io_channel(&io_target); ch1 = spdk_get_io_channel(&ch_count);
set_thread(2); set_thread(2);
ch2 = spdk_get_io_channel(&io_target); ch2 = spdk_get_io_channel(&ch_count);
CU_ASSERT(ch_count == 3);
/* /*
* Test that io_channel handles the case where we start to iterate through * Test that io_channel handles the case where we start to iterate through
@ -434,24 +442,39 @@ for_each_channel_remove(void)
*/ */
set_thread(0); set_thread(0);
spdk_put_io_channel(ch0); spdk_put_io_channel(ch0);
CU_ASSERT(ch_count == 3);
poll_threads(); poll_threads();
spdk_for_each_channel(&io_target, channel_msg, &count, channel_cpl); CU_ASSERT(ch_count == 2);
spdk_for_each_channel(&ch_count, channel_msg, &msg_count, channel_cpl);
CU_ASSERT(msg_count == 0);
poll_threads(); poll_threads();
CU_ASSERT(msg_count == 3);
msg_count = 0;
/* /*
* Case #2: Put the I/O channel after spdk_for_each_channel, but before * Case #2: Put the I/O channel after spdk_for_each_channel, but before
* thread 0 is polled. * thread 0 is polled.
*/ */
ch0 = spdk_get_io_channel(&io_target); ch0 = spdk_get_io_channel(&ch_count);
spdk_for_each_channel(&io_target, channel_msg, &count, channel_cpl); CU_ASSERT(ch_count == 3);
spdk_for_each_channel(&ch_count, channel_msg, &msg_count, channel_cpl);
spdk_put_io_channel(ch0); spdk_put_io_channel(ch0);
poll_threads(); CU_ASSERT(ch_count == 3);
poll_threads();
CU_ASSERT(ch_count == 2);
CU_ASSERT(msg_count == 4);
set_thread(1); set_thread(1);
spdk_put_io_channel(ch1); spdk_put_io_channel(ch1);
CU_ASSERT(ch_count == 2);
set_thread(2); set_thread(2);
spdk_put_io_channel(ch2); spdk_put_io_channel(ch2);
spdk_io_device_unregister(&io_target, NULL); CU_ASSERT(ch_count == 2);
poll_threads();
CU_ASSERT(ch_count == 0);
spdk_io_device_unregister(&ch_count, NULL);
poll_threads(); poll_threads();
free_threads(); free_threads();