diff options
author | Agustina Arzille <avarzille@riseup.net> | 2016-10-17 00:56:58 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-12-27 20:19:38 +0100 |
commit | 7d4a84731cd80a1ef711c83535c6340f0e2b143f (patch) | |
tree | 2c49985f642cf3c3eb98ef83dd2e99ceae99e90e /sysdeps/mach/hurd/pt-mutex-timedlock.c | |
parent | 8f03a364f803ad878ea3ab226fd2955ed4565495 (diff) |
Make pthread_mutex use gsync
* Makefile (libpthread-routines): Add pt-mutexattr-getrobust
pt-mutexattr-setrobust pt-mutex-consistent.
* include/pthread/pthreadtypes.h (__pthread_mutex_robustness): New enum,
containing __PTHREAD_MUTEX_STALLED, __PTHREAD_MUTEX_ROBUST.
* include/pthread/pthread.h [__USE_XOPEN2K] (PTHREAD_MUTEX_STALLED,
PTHREAD_MUTEX_ROBUST): New macros.
[__USE_XOPEN2K8] (pthread_mutex_consistent,
pthread_mutex_consistent_np): New declarations.
* sysdeps/mach/hurd/bits/mutex.h
sysdeps/mach/hurd/pt-mutex-consistent.c
sysdeps/mach/hurd/pt-mutex-destroy.c
sysdeps/mach/hurd/pt-mutex-getprioceiling.c
sysdeps/mach/hurd/pt-mutex-init.c
sysdeps/mach/hurd/pt-mutex-lock.c
sysdeps/mach/hurd/pt-mutex-setprioceiling.c
sysdeps/mach/hurd/pt-mutex-timedlock.c
sysdeps/mach/hurd/pt-mutex-transfer-np.c
sysdeps/mach/hurd/pt-mutex-trylock.c
sysdeps/mach/hurd/pt-mutex-unlock.c
sysdeps/mach/hurd/pt-mutex.h
sysdeps/mach/hurd/pt-mutexattr-destroy.c
sysdeps/mach/hurd/pt-mutexattr-getprioceiling.c
sysdeps/mach/hurd/pt-mutexattr-getprotocol.c
sysdeps/mach/hurd/pt-mutexattr-getpshared.c
sysdeps/mach/hurd/pt-mutexattr-getrobust.c
sysdeps/mach/hurd/pt-mutexattr-gettype.c
sysdeps/mach/hurd/pt-mutexattr-init.c
sysdeps/mach/hurd/pt-mutexattr-setprioceiling.c
sysdeps/mach/hurd/pt-mutexattr-setprotocol.c
sysdeps/mach/hurd/pt-mutexattr-setpshared.c
sysdeps/mach/hurd/pt-mutexattr-setrobust.c
sysdeps/mach/hurd/pt-mutexattr-settype.c
sysdeps/mach/hurd/pt-mutexattr.c: New files
Diffstat (limited to 'sysdeps/mach/hurd/pt-mutex-timedlock.c')
-rw-r--r-- | sysdeps/mach/hurd/pt-mutex-timedlock.c | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/sysdeps/mach/hurd/pt-mutex-timedlock.c b/sysdeps/mach/hurd/pt-mutex-timedlock.c new file mode 100644 index 0000000..3fdd5da --- /dev/null +++ b/sysdeps/mach/hurd/pt-mutex-timedlock.c @@ -0,0 +1,80 @@ +/* Copyright (C) 2016 Free Software Foundation, Inc. + Contributed by Agustina Arzille <avarzille@riseup.net>, 2016. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License + as published by the Free Software Foundation; either + version 2 of the license, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <pthread.h> +#include <stdlib.h> +#include <assert.h> +#include <pt-internal.h> +#include "pt-mutex.h" +#include <hurdlock.h> + +int pthread_mutex_timedlock (pthread_mutex_t *mtxp, + const struct timespec *tsp) +{ + struct __pthread *self; + int ret, flags = mtxp->__flags & GSYNC_SHARED; + + switch (MTX_TYPE (mtxp)) + { + case PT_MTX_NORMAL: + ret = lll_abstimed_lock (&mtxp->__lock, tsp, flags); + break; + + case PT_MTX_RECURSIVE: + self = _pthread_self (); + if (mtx_owned_p (mtxp, self, flags)) + { + if (__glibc_unlikely (mtxp->__cnt + 1 == 0)) + return (EAGAIN); + + ++mtxp->__cnt; + ret = 0; + } + else if ((ret = lll_abstimed_lock (&mtxp->__lock, + tsp, flags)) == 0) + { + mtx_set_owner (mtxp, self, flags); + mtxp->__cnt = 1; + } + + break; + + case PT_MTX_ERRORCHECK: + self = _pthread_self (); + if (mtx_owned_p (mtxp, self, flags)) + ret = EDEADLK; + else if ((ret = lll_abstimed_lock (&mtxp->__lock, + tsp, flags)) == 0) + mtx_set_owner (mtxp, self, flags); + + break; + + case PT_MTX_NORMAL | PTHREAD_MUTEX_ROBUST: + case PT_MTX_RECURSIVE | PTHREAD_MUTEX_ROBUST: + case PT_MTX_ERRORCHECK | PTHREAD_MUTEX_ROBUST: + self = _pthread_self (); + ROBUST_LOCK (self, mtxp, lll_robust_abstimed_lock, tsp, flags); + break; + + default: + ret = EINVAL; + break; + } + + return (ret); +} |