michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: kernel: work_queue: remove unpassable tests

Browse source 
The original implementation of resubmitting a delayed work item
removed the item not only from the schedule, but also from the work
queue if it was already in the work queue.  This is not the semantics
of the new implementation, which will leave the work item in the queue
if the previous deadline had elapsed and the work item was submitted.

The new semantics is preferred, as it improves consistency with SMP
targets where once an item has been submitted to a queue it can be run
at any time, and scheduling it again doesn't magically reverse the
submission.  The original test would never have passed on an SMP
target, and passes now on qemu_x86 only because the timing granularity
prevents the work item from being both scheduled and queued at the
same time.

The problematic test application is the one developed for the original
implementation.  Correct functioning of the new implementation is
fully verified by the sibling work test.  That the legacy API does not
precisely preserve the original behavior where it was not consistent
between SMP and uniprocessor targets is regrettable, but unavoidable.

Remove the tests that cannot pass reliably.

Also fix a missing reset() after a test.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2021-03-09 08:54:59 -06:00 • committed by Anas Nashif
commit 057e4cbc5d
1 changed files with 1 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

90
tests/kernel/workq/work_queue/src/main.c
View file

@ -314,6 +314,7 @@ static void test_delayed_cancel(void)
TC_PRINT(" - Checking results\n"); TC_PRINT(" - Checking results\n");
check_results(0); check_results(0);
reset_results();
} }
static void test_delayed_pending(void) static void test_delayed_pending(void)
@ -347,93 +348,6 @@ static void test_delayed_pending(void)
reset_results(); reset_results();
} }
static void delayed_resubmit_work_handler(struct k_work *work)
{
struct delayed_test_item *ti =
CONTAINER_OF(work, struct delayed_test_item, work);
results[num_results++] = ti->key;
if (ti->key < NUM_TEST_ITEMS) {
ti->key++;
TC_PRINT(" - Resubmitting delayed work\n");
k_delayed_work_submit(&ti->work, K_MSEC(WORK_ITEM_WAIT));
}
}
/**
* @brief Test delayed resubmission of work queue item
*
* @ingroup kernel_workqueue_tests
*
* @see k_delayed_work_init(), k_delayed_work_submit()
*/
static void test_delayed_resubmit(void)
{
TC_PRINT("Starting delayed resubmit test\n");
delayed_tests[0].key = 1;
k_delayed_work_init(&delayed_tests[0].work,
delayed_resubmit_work_handler);
TC_PRINT(" - Submitting delayed work\n");
k_delayed_work_submit(&delayed_tests[0].work, K_MSEC(WORK_ITEM_WAIT));
TC_PRINT(" - Waiting for work to finish\n");
k_msleep(CHECK_WAIT);
TC_PRINT(" - Checking results\n");
check_results(NUM_TEST_ITEMS);
reset_results();
}
static void coop_delayed_work_resubmit(void)
{
int i;
for (i = 0; i < NUM_TEST_ITEMS; i++) {
TC_PRINT(" - Resubmitting delayed work with 1 ms\n");
k_delayed_work_submit(&delayed_tests[0].work, K_MSEC(1));
/* Busy wait 1 ms to force a clash with workqueue */
#if defined(CONFIG_ARCH_POSIX)
k_busy_wait(1000);
#else
volatile uint32_t uptime;
uptime = k_uptime_get_32();
while (k_uptime_get_32() == uptime) {
}
#endif
}
}
/**
* @brief Test delayed resubmission of work queue thread
*
* @ingroup kernel_workqueue_tests
*
* @see k_delayed_work_init()
*/
static void test_delayed_resubmit_thread(void)
{
TC_PRINT("Starting delayed resubmit from coop thread test\n");
delayed_tests[0].key = 1;
k_delayed_work_init(&delayed_tests[0].work, delayed_work_handler);
k_thread_create(&co_op_data, co_op_stack, STACK_SIZE,
(k_thread_entry_t)coop_delayed_work_resubmit,
NULL, NULL, NULL, K_PRIO_COOP(10), 0, K_NO_WAIT);
TC_PRINT(" - Waiting for work to finish\n");
k_msleep(WORK_ITEM_WAIT_ALIGNED);
TC_PRINT(" - Checking results\n");
check_results(1);
reset_results();
}
/** /**
* @brief Test delayed work items * @brief Test delayed work items
* *
@ -807,8 +721,6 @@ void test_main(void)
ztest_1cpu_unit_test(test_sequence), ztest_1cpu_unit_test(test_sequence),
ztest_1cpu_unit_test(test_resubmit), ztest_1cpu_unit_test(test_resubmit),
ztest_1cpu_unit_test(test_delayed), ztest_1cpu_unit_test(test_delayed),
ztest_1cpu_unit_test(test_delayed_resubmit),
ztest_1cpu_unit_test(test_delayed_resubmit_thread),
ztest_1cpu_unit_test(test_delayed_cancel), ztest_1cpu_unit_test(test_delayed_cancel),
ztest_1cpu_unit_test(test_delayed_pending), ztest_1cpu_unit_test(test_delayed_pending),
ztest_1cpu_unit_test(test_triggered), ztest_1cpu_unit_test(test_triggered),