michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: kernel/common: incorrect use of k_poll in timeout order

Browse source 
In the timeout order test, the usage of k_poll() assumes that it
only returns after all events are ready. However, that is not
the case, as k_poll() returns when non-zero number of events are
ready. This means the check for all semaphore being ready after
k_poll() will not always pass. So instead of using k_poll(),
simply wait a bit for timers to fire, then check results.

Also add some bits to clean up at the end of test.

Fixes #34585

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-05-13 15:34:14 -07:00 • committed by Kumar Gala
commit 8fd3d18b40
1 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tests/kernel/common/src/timeout_order.c
View file

@ -41,11 +41,12 @@ static struct k_thread threads[NUM_TIMEOUTS];
*/
/**
* @brief Test timer functionalities
* @brief Test timeout ordering
*
* @details Test polling events with timers
* @details Timeouts, when expiring on the same tick, should be handled
* in the same order they were queued.
*
* @see k_timer_start(), k_poll_event_init()
* @see k_timer_start()
*/
void test_timeout_order(void)
{
@ -74,27 +75,19 @@ void test_timeout_order(void)
k_timer_start(&timer[ii], K_MSEC(100), K_NO_WAIT);
}
static struct k_poll_event poll_events[NUM_TIMEOUTS];
/* Wait for all timers to fire */
k_msleep(125);
for (ii = 0; ii < NUM_TIMEOUTS; ii++) {
k_poll_event_init(&poll_events[ii], K_POLL_TYPE_SEM_AVAILABLE,
K_POLL_MODE_NOTIFY_ONLY, &sem[ii]);
}
/* drop prio to get all poll events together */
k_thread_priority_set(k_current_get(), prio + 1);
zassert_equal(k_poll(poll_events, NUM_TIMEOUTS, K_MSEC(2000)), 0, "");
k_thread_priority_set(k_current_get(), prio - 1);
for (ii = 0; ii < NUM_TIMEOUTS; ii++) {
zassert_equal(poll_events[ii].state,
K_POLL_STATE_SEM_AVAILABLE, "");
}
/* Check results */
for (ii = 0; ii < NUM_TIMEOUTS; ii++) {
zassert_equal(results[ii], ii, "");
}
/* Clean up */
for (ii = 0; ii < NUM_TIMEOUTS; ii++) {
k_timer_stop(&timer[ii]);
k_thread_join(&threads[ii], K_FOREVER);
}
}
/**