mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08: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.
135 lines
3.8 KiB
C
135 lines
3.8 KiB
C
/* Acquire a rwlock for reading. Generic version.
|
|
Copyright (C) 2002-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 <assert.h>
|
|
#include <time.h>
|
|
|
|
#include <pt-internal.h>
|
|
|
|
/* Acquire the rwlock *RWLOCK for reading blocking until *ABSTIME if
|
|
it is already held. As a GNU extension, if TIMESPEC is NULL then
|
|
wait forever. */
|
|
int
|
|
__pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock,
|
|
clockid_t clockid,
|
|
const struct timespec *abstime)
|
|
{
|
|
error_t err;
|
|
int drain;
|
|
struct __pthread *self;
|
|
|
|
__pthread_spin_wait (&rwlock->__lock);
|
|
if (__pthread_spin_trylock (&rwlock->__held) == 0)
|
|
/* Successfully acquired the lock. */
|
|
{
|
|
assert (rwlock->__readerqueue == 0);
|
|
assert (rwlock->__writerqueue == 0);
|
|
assert (rwlock->__readers == 0);
|
|
|
|
rwlock->__readers = 1;
|
|
__pthread_spin_unlock (&rwlock->__lock);
|
|
return 0;
|
|
}
|
|
else
|
|
/* Lock is held, but is held by a reader? */
|
|
if (rwlock->__readers > 0)
|
|
/* Just add ourself to number of readers. */
|
|
{
|
|
assert (rwlock->__readerqueue == 0);
|
|
rwlock->__readers++;
|
|
__pthread_spin_unlock (&rwlock->__lock);
|
|
return 0;
|
|
}
|
|
|
|
/* The lock is busy. */
|
|
|
|
/* Better be blocked by a writer. */
|
|
assert (rwlock->__readers == 0);
|
|
|
|
if (abstime != NULL && ! valid_nanoseconds (abstime->tv_nsec))
|
|
{
|
|
__pthread_spin_unlock (&rwlock->__lock);
|
|
return EINVAL;
|
|
}
|
|
|
|
self = _pthread_self ();
|
|
|
|
/* Add ourself to the queue. */
|
|
__pthread_enqueue (&rwlock->__readerqueue, self);
|
|
__pthread_spin_unlock (&rwlock->__lock);
|
|
|
|
/* Block the thread. */
|
|
if (abstime != NULL)
|
|
err = __pthread_timedblock (self, abstime, clockid);
|
|
else
|
|
{
|
|
err = 0;
|
|
__pthread_block (self);
|
|
}
|
|
|
|
__pthread_spin_wait (&rwlock->__lock);
|
|
if (self->prevp == NULL)
|
|
/* Another thread removed us from the queue, which means a wakeup message
|
|
has been sent. It was either consumed while we were blocking, or
|
|
queued after we timed out and before we acquired the rwlock lock, in
|
|
which case the message queue must be drained. */
|
|
drain = err ? 1 : 0;
|
|
else
|
|
{
|
|
/* We're still in the queue. Noone attempted to wake us up, i.e. we
|
|
timed out. */
|
|
__pthread_dequeue (self);
|
|
drain = 0;
|
|
}
|
|
__pthread_spin_unlock (&rwlock->__lock);
|
|
|
|
if (drain)
|
|
__pthread_block (self);
|
|
|
|
if (err)
|
|
{
|
|
assert (err == ETIMEDOUT);
|
|
return err;
|
|
}
|
|
|
|
/* The reader count has already been increment by whoever woke us
|
|
up. */
|
|
|
|
assert (rwlock->__readers > 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
__pthread_rwlock_timedrdlock (struct __pthread_rwlock *rwlock,
|
|
const struct timespec *abstime)
|
|
{
|
|
return __pthread_rwlock_timedrdlock_internal (rwlock, CLOCK_REALTIME, abstime);
|
|
}
|
|
weak_alias (__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock)
|
|
|
|
int
|
|
__pthread_rwlock_clockrdlock (struct __pthread_rwlock *rwlock,
|
|
clockid_t clockid,
|
|
const struct timespec *abstime)
|
|
{
|
|
return __pthread_rwlock_timedrdlock_internal (rwlock, clockid, abstime);
|
|
}
|
|
weak_alias (__pthread_rwlock_clockrdlock, pthread_rwlock_clockrdlock)
|