nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Revert "pthread_mutex:add deadlock assert"

Browse source 
EDEADLK alreay checked in:
https://github.com/apache/nuttx/blob/master/sched/pthread/pthread_mutextimedlock.c#L112-L127
https://github.com/apache/nuttx/blob/master/sched/pthread/pthread_mutex.c#L195-L201

This reverts commit 112cc083d3.

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-09-23 08:51:29 +08:00 committed by Xiang Xiao
parent 52a4fb6fab
commit 9afcd34282
1 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sched/pthread/pthread_mutex.c
View file

@ -71,41 +71,6 @@ static void pthread_mutex_add(FAR struct pthread_mutex_s *mutex)
leave_critical_section(flags);
}
/****************************************************************************
* Name: pthread_mutex_check
*
* Description:
* Verify that the mutex is not in the list of mutexes held by
* this pthread.
*
* Input Parameters:
* mutex - The mutex to be locked
*
* Returned Value:
* None
*
****************************************************************************/
#ifdef CONFIG_DEBUG_ASSERTIONS
static void pthread_mutex_check(FAR struct pthread_mutex_s *mutex)
{
FAR struct tcb_s *tcb = this_task();
irqstate_t flags = enter_critical_section();
FAR struct pthread_mutex_s *cur;
DEBUGASSERT(mutex != NULL);
for (cur = tcb->mhead; cur != NULL; cur = cur->flink)
{
/* The mutex should not be in the list of mutexes held by this task */
DEBUGASSERT(cur != mutex);
}
leave_critical_section(flags);
}
#endif
/****************************************************************************
* Name: pthread_mutex_remove
*
@ -180,6 +145,9 @@ int pthread_mutex_take(FAR struct pthread_mutex_s *mutex,
{
int ret = EINVAL;
/* Verify input parameters */
DEBUGASSERT(mutex != NULL);
if (mutex != NULL)
{
/* Make sure that no unexpected context switches occur */
@ -229,9 +197,6 @@ int pthread_mutex_take(FAR struct pthread_mutex_s *mutex,
else if (!mutex_is_recursive(&mutex->mutex))
{
#ifdef CONFIG_DEBUG_ASSERTIONS
pthread_mutex_check(mutex);
#endif
pthread_mutex_add(mutex);
}
}