mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 01:40:07 +00:00
28cada0418
* htl/pt-join.c (__pthread_join): Move implementation to... (__pthread_join_common): ... new function. Add try, timed and clock support. (__pthread_join): Reimplement on top of __pthread_join_common. (__pthread_tryjoin_np, __pthread_timedjoin_np, __pthread_clockjoin_np): Implement on top of __pthread_join_common. (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np): New aliases. * hurd/hurdlock.c (__lll_abstimed_wait, __lll_abstimed_xwait, __lll_abstimed_lock): Check for supported clock. * sysdeps/htl/pt-cond-timedwait.c (__pthread_cond_timedwait_internal): Add clockid parameter and support it. (__pthread_cond_timedwait): Pass -1 as clockid. (__pthread_cond_clockwait): New function. (pthread_cond_clockwait): New alias. * sysdeps/htl/pt-cond-wait.c (__pthread_cond_timedwait_internal): Update prototype. (__pthread_cond_wait): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedrdlock.c (__pthread_rwlock_timedrdlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockrdlock): New function. (pthread_rwlock_clockrdlock): New alias. * sysdeps/htl/pt-rwlock-rdlock.c (__pthread_rwlock_timedrdlock_internal): Update prototype. (__pthread_rwlock_rdlock): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedwrlock.c (__pthread_rwlock_timedwrlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockwrlock): New function. (pthread_rwlock_clockwrlock): New alias. * sysdeps/htl/pt-rwlock-wrlock.c (__pthread_rwlock_timedwrlock_internal): Update prototype. (__pthread_rwlock_wrlock): Pass -1 as clockid. * sysdeps/mach/hurd/htl/pt-mutex-timedlock.c (__pthread_mutex_timedlock): Move implementation to (__pthread_mutex_clocklock): New function with additional clockid parameter and support it. (pthread_mutex_clocklock): New alias. (__pthread_mutex_timedlock): Reimplement on top of __pthread_mutex_clocklock. * sysdeps/htl/pthread.h (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np, pthread_mutex_clocklock, pthread_cond_clockwait, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock): New prototypes. * sysdeps/htl/pthreadP.h (__pthread_cond_clockwait): New prototype. * htl/Versions (GLIBC_2.32): Add pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np. * sysdeps/mach/hurd/i386/libpthread.abilist (pthread_clockjoin_np, pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_timedjoin_np, pthread_tryjoin_np): New functions. * nptl/tst-abstime.c, nptl/tst-join10.c, nptl/tst-join11.c, nptl/tst-join12.c, nptl/tst-join13.c, nptl/tst-join14.c, nptl/tst-join2.c, nptl/tst-join3.c, nptl/tst-join8.c, nptl/tst-join9.c, nptl/tst-mutex-errorcheck.c, nptl/tst-pthread-mutexattr.c, nptl/tst-mutex11.c, nptl/tst-mutex5.c, nptl/tst-mutex7.c, nptl/tst-mutex7robus.c, nptl/tst-mutex9.c, nptl/tst-rwlock12.c, nptl/tst-rwlock14.c: Move to sysdeps/pthread. * sysdeps/pthread/tst-mutex8.c: Move back to nptl. * nptl/Makefile (tests): Move tst-mutex5, tst-mutex7, tst-mutex7robust, tst-mutex9, tst-mutex11, tst-rwlock12, tst-rwlock14, tst-join2, tst-join3, tst-join8, tst-join9 tst-join10, tst-join11, tst-join12, tst-join13, tst-join14, tst-abstime, tst-mutex-errorcheck, tst-pthread-mutexattr to ... * sysdeps/pthread/Makefile (tests): ... here.
91 lines
2.5 KiB
C
91 lines
2.5 KiB
C
/* pthread_mutex_timedlock. Hurd version.
|
|
Copyright (C) 2016-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://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_clocklock (pthread_mutex_t *mtxp,
|
|
clockid_t clockid,
|
|
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, clockid);
|
|
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, clockid)) == 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, clockid)) == 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, clockid);
|
|
break;
|
|
|
|
default:
|
|
ret = EINVAL;
|
|
break;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
weak_alias (__pthread_mutex_clocklock, pthread_mutex_clocklock)
|
|
|
|
int
|
|
__pthread_mutex_timedlock (pthread_mutex_t *mutex,
|
|
const struct timespec *tsp)
|
|
{
|
|
return __pthread_mutex_clocklock (mutex, CLOCK_REALTIME, tsp);
|
|
}
|
|
weak_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock)
|
|
hidden_def (__pthread_mutex_timedlock)
|