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

posix: pthread: take care with pthread mutex resources

Browse Source 
Previously, `pthread_mutex_init()` could not actually fail, and
destroying mutexes was a no-op, so it was missing in a couple of
places.

However, with the change of `pthread_mutex_t` to `uint32_t`, and
since those are embedded inside of `struct posix_thread` for the
time being, the pthread code needs to keep track that it is
relinquishes used mutex resources when a thread completes.

Signed-off-by: Chris Friedt <cfriedt@meta.com>
This commit is contained in:
Chris Friedt 2022-11-10 10:11:57 -05:00 committed by Stephanos Ioannidis
parent 6f3e0babb3
commit 6042acc1a9
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/posix/pthread.c
View File

@ -149,6 +149,7 @@ static void zephyr_thread_wrapper(void *arg1, void *arg2, void *arg3)
int pthread_create(pthread_t *newthread, const pthread_attr_t *attr,
void *(*threadroutine)(void *), void *arg)
{
int rv;
int32_t prio;
k_spinlock_key_t key;
uint32_t pthread_num;
@ -181,13 +182,15 @@ int pthread_create(pthread_t *newthread, const pthread_attr_t *attr,
return EAGAIN;
}
prio = posix_to_zephyr_priority(attr->priority, attr->schedpolicy);
rv = pthread_mutex_init(&thread->state_lock, NULL);
if (rv != 0) {
key = k_spin_lock(&pthread_pool_lock);
thread->state = PTHREAD_EXITED;
k_spin_unlock(&pthread_pool_lock, key);
return rv;
}
/*
* Ignore return value, as we know that Zephyr implementation
* cannot fail.
*/
(void)pthread_mutex_init(&thread->state_lock, NULL);
prio = posix_to_zephyr_priority(attr->priority, attr->schedpolicy);
cancel_key = k_spin_lock(&thread->cancel_lock);
thread->cancel_state = (1 << _PTHREAD_CANCEL_POS) & attr->flags;
@ -402,6 +405,8 @@ void pthread_exit(void *retval)
}
pthread_mutex_unlock(&self->state_lock);
pthread_mutex_destroy(&self->state_lock);
k_thread_abort((k_tid_t)self);
}
@ -440,6 +445,10 @@ int pthread_join(pthread_t thread, void **status)
}
pthread_mutex_unlock(&pthread->state_lock);
if (pthread->state == PTHREAD_EXITED) {
pthread_mutex_destroy(&pthread->state_lock);
}
return ret;
}