espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_14084_v5.3' into 'release/v5.3'

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

See merge request espressif/esp-idf!31851
This commit is contained in:
Jiang Jiang Jian
2024-07-31 10:27:19 +08:00
parent bbda124fce 5b4b867a9c
commit 474a92697c
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);