alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-08 04:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

freertos: Fixes hangup upon pthread_join on finished thread

Browse Source
This commit is contained in:
Alexey Gerenkov
2017-09-28 17:55:17 +03:00
parent a3731902f5
commit 54a529f596
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/pthread/pthread.c
View File

@@ -232,6 +232,7 @@ int pthread_join(pthread_t thread, void **retval)
{
esp_pthread_t *pthread = (esp_pthread_t *)thread;
int ret = 0;
bool wait = false;
ESP_LOGV(TAG, "%s %p", __FUNCTION__, pthread);
@@ -257,6 +258,7 @@ int pthread_join(pthread_t thread, void **retval)
} else {
if (pthread->state == PTHREAD_TASK_STATE_RUN) {
pthread->join_task = xTaskGetCurrentTaskHandle();
wait = true;
} else {
pthread_delete(pthread);
}
@@ -264,7 +266,7 @@ int pthread_join(pthread_t thread, void **retval)
}
xSemaphoreGive(s_threads_mux);
if (ret == 0 && pthread->join_task) {
if (ret == 0 && wait) {
xTaskNotifyWait(0, 0, NULL, portMAX_DELAY);
if (xSemaphoreTake(s_threads_mux, portMAX_DELAY) != pdTRUE) {
assert(false && "Failed to lock threads list!");