bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

posix: pthread: thread return value not set by pthread_join()

Browse Source 
Ensure that the thread return value is set by `pthread_join()`
when `status` is non-NULL.

Additionally, we have an opportunity to synchronously clean
up thread stacks in `pthread_join()`, which is preferable.

Signed-off-by: Christopher Friedt <cfriedt@meta.com>
This commit is contained in:
Christopher Friedt 2023-07-30 11:16:12 -04:00 committed by Chris Friedt
parent 033d772d07
commit 73bf557a95
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/posix/pthread.c
View File

@ -623,7 +623,6 @@ int pthread_join(pthread_t pthread, void **status)
{
int err;
int ret;
k_spinlock_key_t key;
struct posix_thread *t;
if (pthread == pthread_self()) {
@ -636,29 +635,41 @@ int pthread_join(pthread_t pthread, void **status)
}
ret = 0;
key = k_spin_lock(&pthread_pool_lock);
if (t->detachstate != PTHREAD_CREATE_JOINABLE) {
ret = EINVAL;
} else if (t->qid == POSIX_THREAD_READY_Q) {
/* marginal chance thread has moved to ready_q between to_posix_thread() and here */
ret = ESRCH;
} else {
K_SPINLOCK(&pthread_pool_lock)
{
if (t->detachstate != PTHREAD_CREATE_JOINABLE) {
ret = EINVAL;
K_SPINLOCK_BREAK;
}
if (t->qid == POSIX_THREAD_READY_Q) {
/* in case thread has moved to ready_q between to_posix_thread() and here */
ret = ESRCH;
K_SPINLOCK_BREAK;
}
/*
* thread is joinable and is in run_q or done_q.
* let's ensure that the thread cannot be joined again after this point.
*/
t->detachstate = PTHREAD_CREATE_DETACHED;
ret = 0;
}
k_spin_unlock(&pthread_pool_lock, key);
if (ret == 0) {
err = k_thread_join(&t->thread, K_FOREVER);
/* other possibilities? */
__ASSERT_NO_MSG(err == 0);
}
return ret;
if (ret != 0) {
return ret;
}
err = k_thread_join(&t->thread, K_FOREVER);
/* other possibilities? */
__ASSERT_NO_MSG(err == 0);
if (status != NULL) {
*status = t->retval;
}
posix_thread_recycle();
return 0;
}
/**