michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: sys_sem: add k_thread_join() calls

Browse source 
There is a race condition between the child threads
exiting, and the child threads getting re-used in the
next scenario. This reproduces more often on SMP systems.

Close the race by joining on the child threads before
exiting any test scenario.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2020-10-27 13:30:17 -07:00 • committed by Andrew Boie
commit f4a4583e13
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/kernel/mem_protect/sys_sem/src/main.c
View file

@ -276,6 +276,8 @@ void test_sem_take_timeout(void)
ret_value = sys_sem_take(&simple_sem, SEM_TIMEOUT); ret_value = sys_sem_take(&simple_sem, SEM_TIMEOUT);
zassert_true(ret_value == 0, zassert_true(ret_value == 0,
"sys_sem_take failed when its shouldn't have"); "sys_sem_take failed when its shouldn't have");
k_thread_join(&sem_tid, K_FOREVER);
} }
/** /**
@ -300,6 +302,8 @@ void test_sem_take_timeout_forever(void)
ret_value = sys_sem_take(&simple_sem, K_FOREVER); ret_value = sys_sem_take(&simple_sem, K_FOREVER);
zassert_true(ret_value == 0, zassert_true(ret_value == 0,
"sys_sem_take failed when its shouldn't have"); "sys_sem_take failed when its shouldn't have");
k_thread_join(&sem_tid, K_FOREVER);
} }
/** /**
@ -318,6 +322,8 @@ void test_sem_take_timeout_isr(void)
ret_value = sys_sem_take(&simple_sem, SEM_TIMEOUT); ret_value = sys_sem_take(&simple_sem, SEM_TIMEOUT);
zassert_true(ret_value == 0, zassert_true(ret_value == 0,
"sys_sem_take failed when its shouldn't have"); "sys_sem_take failed when its shouldn't have");
k_thread_join(&sem_tid, K_FOREVER);
} }
/** /**
@ -418,6 +424,9 @@ void test_sem_take_multiple(void)
zassert_true(signal_count == 1U, zassert_true(signal_count == 1U,
"low priority thread didn't get executed"); "low priority thread didn't get executed");
k_thread_join(&sem_tid, K_FOREVER);
k_thread_join(&sem_tid_1, K_FOREVER);
k_thread_join(&sem_tid_2, K_FOREVER);
} }
/** /**
@ -546,6 +555,10 @@ void test_sem_multiple_threads_wait(void)
signal_count); signal_count);
repeat_count++; repeat_count++;
for (int i = 0; i < TOTAL_THREADS_WAITING; i++) {
k_thread_join(&multiple_tid[i], K_FOREVER);
}
} while (repeat_count < 2); } while (repeat_count < 2);
} }