Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up the nxmutex library

Browse Source 
- Remove the redundant holder, as nxsem now manages hoder TID
- Remove DEBUGASSERTIONS which are managed in nxsem
- Remove the "reset" handling logic, as it is now managed in nxsem
- Inline the simplest functions

Signed-off-by: Jukka Laitinen <jukka.laitinen@tii.ae>
This commit is contained in:
Jukka Laitinen
2025-04-23 19:23:22 +03:00
committed by Xiang Xiao
parent ffb49a25fb
commit 156469f158
5 changed files with 501 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/mutex.h
+487 -365
View File
File diff suppressed because it is too large Load Diff
include/pthread.h
+1 -2
View File
@@ -350,8 +350,7 @@ typedef struct pthread_mutex_s pthread_mutex_t;
#define PTHREAD_NXMUTEX_INITIALIZER { \ #define PTHREAD_NXMUTEX_INITIALIZER { \
NXSEM_INITIALIZER(NXSEM_NO_MHOLDER, \ NXSEM_INITIALIZER(NXSEM_NO_MHOLDER, \
SEM_TYPE_MUTEX | PTHREAD_MUTEX_DEFAULT_PRIO_FLAGS), \ SEM_TYPE_MUTEX | PTHREAD_MUTEX_DEFAULT_PRIO_FLAGS)}
NXMUTEX_NO_HOLDER}
#define PTHREAD_NXRMUTEX_INITIALIZER {PTHREAD_NXMUTEX_INITIALIZER, 0} #define PTHREAD_NXRMUTEX_INITIALIZER {PTHREAD_NXMUTEX_INITIALIZER, 0}
#if defined(CONFIG_PTHREAD_MUTEX_TYPES) && !defined(CONFIG_PTHREAD_MUTEX_UNSAFE) #if defined(CONFIG_PTHREAD_MUTEX_TYPES) && !defined(CONFIG_PTHREAD_MUTEX_UNSAFE)
libs/libc/misc/lib_mutex.c
+10 -548
View File
File diff suppressed because it is too large Load Diff
sched/misc/deadlock.c
+2 -2
View File
@@ -100,8 +100,8 @@ static void collect_deadlock(FAR struct tcb_s *tcb, FAR void *arg)
pid_t holder; pid_t holder;
size_t i; size_t i;
holder = mutex->holder; holder = nxmutex_get_holder(mutex);
if (holder == NXMUTEX_NO_HOLDER) if (holder < 0)
{ {
break; break;
} }
sched/sched/sched_get_stateinfo.c
+1 -1
View File
@@ -101,7 +101,7 @@ void nxsched_get_stateinfo(FAR struct tcb_s *tcb, FAR char *state,
if (tcb->task_state == TSTATE_WAIT_SEM && if (tcb->task_state == TSTATE_WAIT_SEM &&
((FAR sem_t *)(tcb->waitobj))->flags & SEM_TYPE_MUTEX) ((FAR sem_t *)(tcb->waitobj))->flags & SEM_TYPE_MUTEX)
{ {
pid_t holder = ((FAR mutex_t *)(tcb->waitobj))->holder; pid_t holder = nxmutex_get_holder((FAR mutex_t *)tcb->waitobj);
leave_critical_section(flags); leave_critical_section(flags);
snprintf(state, length, "Waiting,Mutex:%d", holder); snprintf(state, length, "Waiting,Mutex:%d", holder);