Skip to content

Commit

Permalink
Revert "pthread_mutex:add deadlock assert"
Browse files Browse the repository at this point in the history
  • Loading branch information
anchao authored and xiaoxiang781216 committed Sep 23, 2024
1 parent 52a4fb6 commit 9afcd34
Showing 1 changed file with 3 additions and 38 deletions.
41 changes: 3 additions & 38 deletions sched/pthread/pthread_mutex.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
}
}
Expand Down

0 comments on commit 9afcd34

Please sign in to comment.