sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pthread: Minor logic fix in pthread_mutex_consistent. Updat some comments.

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-10 10:10:41 -06:00
parent 6935d44405
commit c36bf090f0
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sched/pthread/pthread_mutexconsistent.c
View File

@ -104,13 +104,14 @@ int pthread_mutex_consistent(FAR pthread_mutex_t *mutex)
DEBUGASSERT(mutex->pid != 0); /* < 0: available, >0 owned, ==0 error */
if (mutex->pid >= 0)
{
/* No.. Verify that the PID still exists. We may be destroying
* the mutex after cancelling a pthread and the mutex may have
* been in a bad state owned by the dead pthread. NOTE: The
* folling is unspecified behavior (see pthread_mutex_consistent()).
/* No.. Verify that the thread associated with the PID still
* exists. We may be destroying the mutex after cancelling a
* pthread and the mutex may have been in a bad state owned by
* the dead pthread. NOTE: The following is unspecified behavior
* (see pthread_mutex_consistent()).
*
* If the holding thread is still valid, then we should be able to
* map its PID to the underlying TCB. That is what sched_gettcb()
* map its PID to the underlying TCB. That is what sched_gettcb()
* does.
*/
@ -119,6 +120,7 @@ int pthread_mutex_consistent(FAR pthread_mutex_t *mutex)
/* The thread associated with the PID no longer exists */
mutex->pid = -1;
mutex->flags &= _PTHREAD_MFLAGS_ROBUST;
#ifdef CONFIG_PTHREAD_MUTEX_TYPES
mutex->nlocks = 0;
#endif
@ -129,11 +131,23 @@ int pthread_mutex_consistent(FAR pthread_mutex_t *mutex)
status = sem_reset((FAR sem_t *)&mutex->sem, 1);
ret = (status != OK) ? get_errno() : OK;
}
/* Otherwise the mutex is held by some active thread. Let's not
* touch anything!
*/
}
else
{
/* There is no holder of the mutex. Just make sure the
* inconsistent flag is cleared and the number of locks is zero.
*/
mutex->flags &= _PTHREAD_MFLAGS_ROBUST;
#ifdef CONFIG_PTHREAD_MUTEX_TYPES
mutex->nlocks = 0;
#endif
}
/* Clear the inconsistent flag in any case */
mutex->flags &= _PTHREAD_MFLAGS_ROBUST;
sched_unlock();
ret = OK;
}