Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

pthread_cleanup: rm sched_[un]lock

Browse Source 
Since TLS is only used within a single thread and requires no additional protection.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5
2023-09-15 08:46:08 +08:00
committed by Xiang Xiao
parent fa744e24a3
commit 51a412c6b4
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/pthread/pthread_cleanup.c
-21
View File
@@ -52,9 +52,6 @@
* Returned Value: * Returned Value:
* None * None
* *
* Assumptions:
* The scheduler is locked.
*
****************************************************************************/ ****************************************************************************/
static void pthread_cleanup_pop_tls(FAR struct tls_info_s *tls, int execute) static void pthread_cleanup_pop_tls(FAR struct tls_info_s *tls, int execute)
@@ -122,14 +119,7 @@ void pthread_cleanup_pop(int execute)
DEBUGASSERT(tls != NULL); DEBUGASSERT(tls != NULL);
/* sched_lock() should provide sufficient protection. We only need to
* have this TCB stationary; the pthread cleanup stack should never be
* modified by interrupt level logic.
*/
sched_lock();
pthread_cleanup_pop_tls(tls, execute); pthread_cleanup_pop_tls(tls, execute);
sched_unlock();
} }
void pthread_cleanup_push(pthread_cleanup_t routine, FAR void *arg) void pthread_cleanup_push(pthread_cleanup_t routine, FAR void *arg)
@@ -139,12 +129,6 @@ void pthread_cleanup_push(pthread_cleanup_t routine, FAR void *arg)
DEBUGASSERT(tls != NULL); DEBUGASSERT(tls != NULL);
DEBUGASSERT(tls->tos < CONFIG_PTHREAD_CLEANUP_STACKSIZE); DEBUGASSERT(tls->tos < CONFIG_PTHREAD_CLEANUP_STACKSIZE);
/* sched_lock() should provide sufficient protection. We only need to
* have this TCB stationary; the pthread cleanup stack should never be
* modified by interrupt level logic.
*/
sched_lock();
if (tls->tos < CONFIG_PTHREAD_CLEANUP_STACKSIZE) if (tls->tos < CONFIG_PTHREAD_CLEANUP_STACKSIZE)
{ {
unsigned int ndx = tls->tos; unsigned int ndx = tls->tos;
@@ -153,8 +137,6 @@ void pthread_cleanup_push(pthread_cleanup_t routine, FAR void *arg)
tls->stack[ndx].pc_cleaner = routine; tls->stack[ndx].pc_cleaner = routine;
tls->stack[ndx].pc_arg = arg; tls->stack[ndx].pc_arg = arg;
} }
sched_unlock();
} }
/**************************************************************************** /****************************************************************************
@@ -177,13 +159,10 @@ void pthread_cleanup_popall(FAR struct tls_info_s *tls)
{ {
DEBUGASSERT(tls != NULL); DEBUGASSERT(tls != NULL);
sched_lock();
while (tls->tos > 0) while (tls->tos > 0)
{ {
pthread_cleanup_pop_tls(tls, 1); pthread_cleanup_pop_tls(tls, 1);
} }
sched_unlock();
} }
#endif /* defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) && CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0 */ #endif /* defined(CONFIG_PTHREAD_CLEANUP_STACKSIZE) && CONFIG_PTHREAD_CLEANUP_STACKSIZE > 0 */