d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return EPERM if mutex owner is not current thread but it tries to

Browse Source 
unlock the mutex, old code confuses some programs when it returns EINVAL.

Noticed by: bland
This commit is contained in:
David Xu 2004-01-17 03:09:57 +00:00
parent cc3782cbc7
commit e4dcaa6ee9
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/libkse/thread/thr_mutex.c
View File

@ -1001,12 +1001,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference)
* mutex: * mutex:
*/ */
if ((*m)->m_owner != curthread) if ((*m)->m_owner != curthread)
/* ret = EPERM;
* Return an invalid argument error for no
* owner and a permission error otherwise:
*/
ret = (*m)->m_owner == NULL ? EINVAL : EPERM;
else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*m)->m_count > 0)) ((*m)->m_count > 0))
/* Decrement the count: */ /* Decrement the count: */
@ -1039,12 +1034,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference)
* mutex: * mutex:
*/ */
if ((*m)->m_owner != curthread) if ((*m)->m_owner != curthread)
/* ret = EPERM;
* Return an invalid argument error for no
* owner and a permission error otherwise:
*/
ret = (*m)->m_owner == NULL ? EINVAL : EPERM;
else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*m)->m_count > 0)) ((*m)->m_count > 0))
/* Decrement the count: */ /* Decrement the count: */
@ -1096,12 +1086,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference)
* mutex: * mutex:
*/ */
if ((*m)->m_owner != curthread) if ((*m)->m_owner != curthread)
/* ret = EPERM;
* Return an invalid argument error for no
* owner and a permission error otherwise:
*/
ret = (*m)->m_owner == NULL ? EINVAL : EPERM;
else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*m)->m_count > 0)) ((*m)->m_count > 0))
/* Decrement the count: */ /* Decrement the count: */

21
lib/libpthread/thread/thr_mutex.c
View File

@ -1001,12 +1001,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference)
* mutex: * mutex:
*/ */
if ((*m)->m_owner != curthread) if ((*m)->m_owner != curthread)
/* ret = EPERM;
* Return an invalid argument error for no
* owner and a permission error otherwise:
*/
ret = (*m)->m_owner == NULL ? EINVAL : EPERM;
else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*m)->m_count > 0)) ((*m)->m_count > 0))
/* Decrement the count: */ /* Decrement the count: */
@ -1039,12 +1034,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference)
* mutex: * mutex:
*/ */
if ((*m)->m_owner != curthread) if ((*m)->m_owner != curthread)
/* ret = EPERM;
* Return an invalid argument error for no
* owner and a permission error otherwise:
*/
ret = (*m)->m_owner == NULL ? EINVAL : EPERM;
else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*m)->m_count > 0)) ((*m)->m_count > 0))
/* Decrement the count: */ /* Decrement the count: */
@ -1096,12 +1086,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference)
* mutex: * mutex:
*/ */
if ((*m)->m_owner != curthread) if ((*m)->m_owner != curthread)
/* ret = EPERM;
* Return an invalid argument error for no
* owner and a permission error otherwise:
*/
ret = (*m)->m_owner == NULL ? EINVAL : EPERM;
else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) && else if (((*m)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*m)->m_count > 0)) ((*m)->m_count > 0))
/* Decrement the count: */ /* Decrement the count: */