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

freertos: Fixes deadlock in pthread_once for init_routines calling pthread_once

Browse Source
This commit is contained in:
Alexey Gerenkov
2017-09-28 21:18:29 +03:00
parent 54a529f596
commit 5795ccc806
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/pthread/pthread.c
View File

@@ -72,7 +72,7 @@ static int IRAM_ATTR pthread_mutex_lock_internal(esp_pthread_mutex_t *mux, TickT
esp_err_t esp_pthread_init(void) esp_err_t esp_pthread_init(void)
{ {
vListInitialise((List_t *)&s_threads_list); vListInitialise((List_t *)&s_threads_list);
s_once_mux = xSemaphoreCreateMutex(); s_once_mux = xSemaphoreCreateRecursiveMutex();
if (s_once_mux == NULL) { if (s_once_mux == NULL) {
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
@@ -377,7 +377,9 @@ int pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
TaskHandle_t cur_task = xTaskGetCurrentTaskHandle(); TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
// do not take mutex if OS is not running yet // do not take mutex if OS is not running yet
if (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED || if (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED ||
!cur_task || xSemaphoreTake(s_once_mux, portMAX_DELAY) == pdTRUE) // init_routine can call pthread_once for another objects, so use recursive mutex
// FIXME: behaviour is undefined if init_routine calls pthread_once for the same object in the current context
!cur_task || xSemaphoreTakeRecursive(s_once_mux, portMAX_DELAY) == pdTRUE)
{ {
if (!once_control->init_executed) { if (!once_control->init_executed) {
ESP_LOGV(TAG, "%s: call init_routine %p", __FUNCTION__, once_control); ESP_LOGV(TAG, "%s: call init_routine %p", __FUNCTION__, once_control);
@@ -385,7 +387,7 @@ int pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
once_control->init_executed = 1; once_control->init_executed = 1;
} }
if (cur_task) { if (cur_task) {
xSemaphoreGive(s_once_mux); xSemaphoreGiveRecursive(s_once_mux);
} }
} }
else else

24
components/pthread/test/test_pthread_cxx.cpp
View File

@@ -2,6 +2,8 @@
#include <sstream> #include <sstream>
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "unity.h" #include "unity.h"
#if __GTHREADS && __GTHREADS_CXX0X #if __GTHREADS && __GTHREADS_CXX0X
@@ -61,7 +63,7 @@ static void thread_main()
} }
} }
TEST_CASE("pthread CXX", "[pthread]") TEST_CASE("pthread C++", "[pthread]")
{ {
global_sp.reset(new int(1)); global_sp.reset(new int(1));
@@ -85,16 +87,32 @@ TEST_CASE("pthread CXX", "[pthread]")
} }
} }
static void task_test_sandbox(void *ignore) { static void task_test_sandbox(void *arg)
{
bool *running = (bool *)arg;
ESP_LOGI(TAG, "About to create a string stream"); ESP_LOGI(TAG, "About to create a string stream");
std::stringstream ss; std::stringstream ss;
ESP_LOGI(TAG, "About to write to string stream"); ESP_LOGI(TAG, "About to write to string stream");
ss << "Hello World!"; ss << "Hello World!";
ESP_LOGI(TAG, "About to extract from stringstream");
ESP_LOGI(TAG, "Text: %s", ss.str().c_str());
if (running) {
*running = false;
vTaskDelete(NULL);
}
} }
TEST_CASE("pthread CXX 2", "[pthread]") TEST_CASE("pthread mix C/C++", "[pthread]")
{ {
bool running = true;
std::thread t1(task_test_sandbox, (void *)NULL); std::thread t1(task_test_sandbox, (void *)NULL);
xTaskCreatePinnedToCore((TaskFunction_t)&task_test_sandbox, "task_test_sandbox", 2048, &running, 5, NULL, 0);
while (running) {
vTaskDelay(1);
}
if (t1.joinable()) { if (t1.joinable()) {
std::cout << "Join thread " << std::hex << t1.get_id() << std::endl; std::cout << "Join thread " << std::hex << t1.get_id() << std::endl;
t1.join(); t1.join();