feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'contrib/github_pr_14084' into 'master'

Browse Source 
remove TLS pointer/deletion callback from correct thread (GitHub PR)

Closes IDFGH-13144

See merge request espressif/esp-idf!31766
This commit is contained in:
Marius Vikhammer
2024-07-02 13:31:52 +08:00
parent 15219e2a7e c1e58e7d2d
commit 15b05d59c3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/pthread/pthread_local_storage.c
View File

@@ -147,7 +147,9 @@ static void pthread_cleanup_thread_specific_data_callback(int index, void *v_tls
free(tls); free(tls);
} }
/* this function called from pthread_task_func for "early" cleanup of TLS in a pthread */ /* this function called from pthread_task_func for "early" cleanup of TLS in a pthread
and from pthread_join/pthread_detach for cleanup of TLS after pthread exit
*/
void pthread_internal_local_storage_destructor_callback(TaskHandle_t handle) void pthread_internal_local_storage_destructor_callback(TaskHandle_t handle)
{ {
void *tls = pvTaskGetThreadLocalStoragePointer(handle, PTHREAD_TLS_INDEX); void *tls = pvTaskGetThreadLocalStoragePointer(handle, PTHREAD_TLS_INDEX);
@@ -157,9 +159,9 @@ void pthread_internal_local_storage_destructor_callback(TaskHandle_t handle)
calling it again... calling it again...
*/ */
#if !defined(CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS) #if !defined(CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS)
vTaskSetThreadLocalStoragePointer(NULL, PTHREAD_TLS_INDEX, NULL); vTaskSetThreadLocalStoragePointer(handle, PTHREAD_TLS_INDEX, NULL);
#else #else
vTaskSetThreadLocalStoragePointerAndDelCallback(NULL, vTaskSetThreadLocalStoragePointerAndDelCallback(handle,
PTHREAD_TLS_INDEX, PTHREAD_TLS_INDEX,
NULL, NULL,
NULL); NULL);