Skip to content

修复POSIX线程本地存储寻找posix线程句柄时的逻辑错误 #8790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernardXiong merged 7 commits into from
Apr 15, 2024
Merged

修复POSIX线程本地存储寻找posix线程句柄时的逻辑错误 #8790

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d05de8
Add GCC generalized atomic operation function
atwwww Mar 20, 2024
d2fe1b3
Merge branch 'RT-Thread:master' into master
atwwww Mar 25, 2024
9467709
Merge branch 'RT-Thread:master' into master
atwwww Mar 25, 2024
d5385af
Merge branch 'RT-Thread:master' into master
atwwww Mar 26, 2024
e195f94
Merge branch 'RT-Thread:master' into master
atwwww Apr 13, 2024
d733827
修复POSIX线程本地存储寻找posix线程句柄时的逻辑错误
atwwww Apr 13, 2024
ce61d32
Merge branch 'RT-Thread:master' into master
atwwww Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/libc/posix/pthreads/pthread_tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void *pthread_getspecific(pthread_key_t key)
if (rt_thread_self() == NULL) return NULL;

/* get pthread data from user data of thread */
ptd = (_pthread_data_t *)rt_thread_self()->user_data;
ptd = (_pthread_data_t *)rt_thread_self()->pthread_data;
RT_ASSERT(ptd != NULL);

if (ptd->tls == NULL)
Expand All @@ -48,7 +48,7 @@ int pthread_setspecific(pthread_key_t key, const void *value)
if (rt_thread_self() == NULL) return EINVAL;

/* get pthread data from user data of thread */
ptd = (_pthread_data_t *)rt_thread_self()->user_data;
ptd = (_pthread_data_t *)rt_thread_self()->pthread_data;
RT_ASSERT(ptd != NULL);

/* check tls area */
Expand Down