Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some incorrect behavior pointed out in #2990:

Browse Source 
* The pthread_mutex_*lock() family should return EDEADLK when re-locking
  an error-checked mutex.
* pthread_mutex_trylock() is supposed to return EBUSY, not
  B_WOULD_BLOCK.
* pthread_mutex_unlock() should return EPERM when the caller is not the
  owner. It used to print a message and try to unlock anyway.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28354 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-10-28 12:04:51 +00:00
parent 6805373afd
commit f20ccdc461
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/system/libroot/posix/pthread/pthread_mutex.c
View File

@ -85,7 +85,7 @@ mutex_lock(pthread_mutex_t *mutex, bigtime_t timeout)
if (MUTEX_TYPE(mutex) == PTHREAD_MUTEX_ERRORCHECK if (MUTEX_TYPE(mutex) == PTHREAD_MUTEX_ERRORCHECK
&& mutex->owner == thisThread) { && mutex->owner == thisThread) {
// we detect this kind of deadlock and return an error // we detect this kind of deadlock and return an error
return B_BUSY; return EDEADLK;
} }
if (MUTEX_TYPE(mutex) == PTHREAD_MUTEX_RECURSIVE if (MUTEX_TYPE(mutex) == PTHREAD_MUTEX_RECURSIVE
@ -123,11 +123,12 @@ pthread_mutex_lock(pthread_mutex_t *mutex)
int int
pthread_mutex_trylock(pthread_mutex_t *mutex) pthread_mutex_trylock(pthread_mutex_t *mutex)
{ {
return mutex_lock(mutex, 0); status_t status = mutex_lock(mutex, 0);
return status == B_WOULD_BLOCK ? EBUSY : status;
} }
int int
pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *tv) pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *tv)
{ {
bool invalidTime = false; bool invalidTime = false;
@ -156,11 +157,8 @@ pthread_mutex_unlock(pthread_mutex_t *mutex)
if (mutex == NULL) if (mutex == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
if (mutex->owner != find_thread(NULL)) { if (mutex->owner != find_thread(NULL))
// this is a bug in the calling application! return EPERM;
// ToDo: should we handle it in another way?
fprintf(stderr, "mutex unlocked from foreign thread!\n");
}
if (MUTEX_TYPE(mutex) == PTHREAD_MUTEX_RECURSIVE) { if (MUTEX_TYPE(mutex) == PTHREAD_MUTEX_RECURSIVE) {
if (mutex->owner_count-- > 1) if (mutex->owner_count-- > 1)
@ -176,7 +174,7 @@ pthread_mutex_unlock(pthread_mutex_t *mutex)
} }
int int
pthread_mutex_getprioceiling(pthread_mutex_t *mutex, int *_prioCeiling) pthread_mutex_getprioceiling(pthread_mutex_t *mutex, int *_prioCeiling)
{ {
if (mutex == NULL || _prioCeiling == NULL) if (mutex == NULL || _prioCeiling == NULL)
@ -189,7 +187,7 @@ pthread_mutex_getprioceiling(pthread_mutex_t *mutex, int *_prioCeiling)
} }
int int
pthread_mutex_setprioceiling(pthread_mutex_t *mutex, int prioCeiling, pthread_mutex_setprioceiling(pthread_mutex_t *mutex, int prioCeiling,
int *_oldCeiling) int *_oldCeiling)
{ {