Commit 5dcd6f63 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

test: Move poller test to the thread unit test 



This is the more appropriate location for this test

Change-Id: If556b365975f5658a55924aeb7122186961972bd
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/417365


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent 2fac05e9

test/unit/lib/bdev/mt/bdev.c/bdev_ut.c

+0 −58
Original line number Diff line number Diff line
@@ -305,63 +305,6 @@ basic(void) 
	teardown_test();

}



static int

poller_run_done(void *ctx)

{

	bool	*poller_run = ctx;



	*poller_run = true;



	return -1;

}



static void

basic_poller(void)

{

	struct spdk_poller	*poller = NULL;

	bool			poller_run = false;



	setup_test();



	set_thread(0);

	reset_time();

	/* Register a poller with no-wait time and test execution */

	poller = spdk_poller_register(poller_run_done, &poller_run, 0);

	CU_ASSERT(poller != NULL);



	poll_threads();

	CU_ASSERT(poller_run == true);



	spdk_poller_unregister(&poller);

	CU_ASSERT(poller == NULL);



	/* Register a poller with 1000us wait time and test single execution */

	poller_run = false;

	poller = spdk_poller_register(poller_run_done, &poller_run, 1000);

	CU_ASSERT(poller != NULL);



	poll_threads();

	CU_ASSERT(poller_run == false);



	increment_time(1000);

	poll_threads();

	CU_ASSERT(poller_run == true);



	reset_time();

	poller_run = false;

	poll_threads();

	CU_ASSERT(poller_run == false);



	increment_time(1000);

	poll_threads();

	CU_ASSERT(poller_run == true);



	spdk_poller_unregister(&poller);

	CU_ASSERT(poller == NULL);



	teardown_test();

}



static void

reset_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)

{
@@ -1227,7 +1170,6 @@ main(int argc, char **argv) 


	if (

		CU_add_test(suite, "basic", basic) == NULL ||

		CU_add_test(suite, "basic_poller", basic_poller) == NULL ||

		CU_add_test(suite, "basic_qos", basic_qos) == NULL ||

		CU_add_test(suite, "put_channel_during_reset", put_channel_during_reset) == NULL ||

		CU_add_test(suite, "aborted_reset", aborted_reset) == NULL ||

test/unit/lib/thread/thread.c/thread_ut.c

+58 −0
Original line number Diff line number Diff line
@@ -97,6 +97,63 @@ thread_send_msg(void) 
	free_threads();

}



static int

poller_run_done(void *ctx)

{

	bool	*poller_run = ctx;



	*poller_run = true;



	return -1;

}



static void

thread_poller(void)

{

	struct spdk_poller	*poller = NULL;

	bool			poller_run = false;



	allocate_threads(1);



	set_thread(0);

	reset_time();

	/* Register a poller with no-wait time and test execution */

	poller = spdk_poller_register(poller_run_done, &poller_run, 0);

	CU_ASSERT(poller != NULL);



	poll_threads();

	CU_ASSERT(poller_run == true);



	spdk_poller_unregister(&poller);

	CU_ASSERT(poller == NULL);



	/* Register a poller with 1000us wait time and test single execution */

	poller_run = false;

	poller = spdk_poller_register(poller_run_done, &poller_run, 1000);

	CU_ASSERT(poller != NULL);



	poll_threads();

	CU_ASSERT(poller_run == false);



	increment_time(1000);

	poll_threads();

	CU_ASSERT(poller_run == true);



	reset_time();

	poller_run = false;

	poll_threads();

	CU_ASSERT(poller_run == false);



	increment_time(1000);

	poll_threads();

	CU_ASSERT(poller_run == true);



	spdk_poller_unregister(&poller);

	CU_ASSERT(poller == NULL);



	free_threads();

}



static void

for_each_cb(void *ctx)

{
@@ -424,6 +481,7 @@ main(int argc, char **argv) 
	if (

		CU_add_test(suite, "thread_alloc", thread_alloc) == NULL ||

		CU_add_test(suite, "thread_send_msg", thread_send_msg) == NULL ||

		CU_add_test(suite, "thread_poller", thread_poller) == NULL ||

		CU_add_test(suite, "thread_for_each", thread_for_each) == NULL ||

		CU_add_test(suite, "for_each_channel_remove", for_each_channel_remove) == NULL ||

		CU_add_test(suite, "for_each_channel_unreg", for_each_channel_unreg) == NULL ||