sched/pthread: Implement pthread_mutex_trylock() for recursive mutexes

This commit is contained in:
Juha Niskanen
2015-06-16 08:32:20 -06:00
committed by Gregory Nutt
parent d16053c33c
commit e1846dff82
2 changed files with 38 additions and 3 deletions
+5
View File
@@ -114,6 +114,11 @@
* *
* Assumptions: * Assumptions:
* *
* POSIX Compatibility:
* - This implementation does not return EAGAIN when the mutex could not be
* acquired because the maximum number of recursive locks for mutex has
* been exceeded.
*
****************************************************************************/ ****************************************************************************/
int pthread_mutex_lock(FAR pthread_mutex_t *mutex) int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
+33 -3
View File
@@ -90,10 +90,15 @@
* *
* Return Value: * Return Value:
* 0 on success or an errno value on failure. Note that the errno EINTR * 0 on success or an errno value on failure. Note that the errno EINTR
* is never returned by pthread_mutex_lock(). * is never returned by pthread_mutex_trylock().
* *
* Assumptions: * Assumptions:
* *
* POSIX Compatibility:
* - This implementation does not return EAGAIN when the mutex could not be
* acquired because the maximum number of recursive locks for mutex has
* been exceeded.
*
****************************************************************************/ ****************************************************************************/
int pthread_mutex_trylock(FAR pthread_mutex_t *mutex) int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
@@ -108,6 +113,8 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
} }
else else
{ {
int mypid = (int)getpid();
/* Make sure the semaphore is stable while we make the following /* Make sure the semaphore is stable while we make the following
* checks. This all needs to be one atomic action. * checks. This all needs to be one atomic action.
*/ */
@@ -118,18 +125,41 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
if (sem_trywait((sem_t*)&mutex->sem) == OK) if (sem_trywait((sem_t*)&mutex->sem) == OK)
{ {
/* If we succussfully obtained the semaphore, then indicate /* If we successfully obtained the semaphore, then indicate
* that we own it. * that we own it.
*/ */
mutex->pid = (int)getpid(); mutex->pid = mypid;
#ifdef CONFIG_MUTEX_TYPES
if (mutex->type == PTHREAD_MUTEX_RECURSIVE)
{
mutex->nlocks = 1;
}
#endif
} }
/* Was it not available? */ /* Was it not available? */
else if (get_errno() == EAGAIN) else if (get_errno() == EAGAIN)
{ {
#ifdef CONFIG_MUTEX_TYPES
/* Check if recursive mutex was locked by ourself. */
if (mutex->type == PTHREAD_MUTEX_RECURSIVE && mutex->pid == mypid)
{
/* Increment the number of locks held and return successfully. */
mutex->nlocks++;
}
else
{
ret = EBUSY;
}
#else
ret = EBUSY; ret = EBUSY;
#endif
} }
else else
{ {