summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-02-24 20:20:33 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-02-24 20:20:33 +0100
commit55c35d62a3a6ae0d90db40c6e4a2d94d05be71e3 (patch)
treef383fb136f579899c8b382210148e74cfaad8419 /sysdeps
parentff05b0085a231b64d4128517eeb93aaf248a9736 (diff)
Fix pthread_mutex_trylock return value
* sysdeps/mach/hurd/pt-mutex-trylock.c (__pthread_mutex_trylock): Return EBUSY on failure instead of -1.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/mach/hurd/pt-mutex-trylock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sysdeps/mach/hurd/pt-mutex-trylock.c b/sysdeps/mach/hurd/pt-mutex-trylock.c
index 6680094..59244e8 100644
--- a/sysdeps/mach/hurd/pt-mutex-trylock.c
+++ b/sysdeps/mach/hurd/pt-mutex-trylock.c
@@ -32,6 +32,8 @@ int __pthread_mutex_trylock (pthread_mutex_t *mtxp)
{
case PT_MTX_NORMAL:
ret = lll_trylock (&mtxp->__lock);
+ if (ret)
+ ret = EBUSY;
break;
case PT_MTX_RECURSIVE:
@@ -49,6 +51,8 @@ int __pthread_mutex_trylock (pthread_mutex_t *mtxp)
mtx_set_owner (mtxp, self, mtxp->__flags);
mtxp->__cnt = 1;
}
+ else
+ ret = EBUSY;
break;
@@ -56,6 +60,8 @@ int __pthread_mutex_trylock (pthread_mutex_t *mtxp)
self = _pthread_self ();
if ((ret = lll_trylock (&mtxp->__lock)) == 0)
mtx_set_owner (mtxp, self, mtxp->__flags);
+ else
+ ret = EBUSY;
break;
case PT_MTX_NORMAL | PTHREAD_MUTEX_ROBUST: