mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-30 12:31:53 +08:00
713ddf8d12
lll_futex_wake not lll_private_futex_wake. * sysdeps/unix/sysv/linux/arm/bits/fcntl.h (O_CLOEXEC): Define. * sysdeps/unix/sysv/linux/arm/eabi/sysdep.h: Include <tls.h> * sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.c (__lll_lock_wait_private, __lll_lock_wait): New. (__lll_timedlock_wait): Don't include in libc.so; Take private argument. Use atomic_compare_and_exchange_bool_acq. * sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h: Renamed all lll_mutex_* resp. lll_robust_mutex_* macros to lll_* resp. lll_robust_*. Renamed all LLL_MUTEX_LOCK_* macros to LLL_LOCK_*. Include <kernel-features.h>. (LLL_LOCK_INITIALIZER): Remove duplicate definition. (__lll_private_flag): Define. (lll_futex_timed_wait): Pass private flag to syscall. (lll_futex_wake): Likewise. (lll_private_futex_wait, lll_private_futex_timed_wait, lll_private_futex_wake): Remove. (lll_robust_dead, lll_futex_requeue): Take private arguments. (lll_futex_wake_unlock): Pass private flag to syscall. (__lll_robust_trylock): Convert to macro. (__lll_robust_lock_wait): Add private argument. (__lll_lock_wait_private, __lll_lock_wait): Declare. (__lll_lock): Convert to macro. Take private argument. (__lll_cond_lock): Likewise. (lll_lock, lll_cond_lock): Take private arguments. (__lll_robust_lock): Take private argument. (__lll_timedlock_wait, __lll_robust_timedlock_wait): Take private arguments. (__lll_timedlock, __lll_robust_timedlock): Convert to macros. Take private arguments. (lll_timedlock, lll_robust_timedlock): Take private arguments. (__lll_unlock, __lll_robust_unlock): Convert to macros. Take private arguments. (lll_unlock, lll_robust_unlock): Take private arguments. (__lll_mutex_unlock_force, lll_mutex_unlock_force, lll_lock_t, lll_trylock, lll_lock, lll_unlock, lll_islocked): Remove. (lll_wait_tid): Pass LLL_SHARED to lll_futex_wait. (__lll_cond_wait, __lll_cond_timedwait, __lll_cond_wake, __lll_cond_broadcast, lll_cond_wait, lll_cond_timedwait, lll_cond_wake, lll_cond_broadcast): Remove. * sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c (clear_once_control, __pthread_once): Use lll_futex_wake not lll_private_futex_wake.
134 lines
3.4 KiB
C
134 lines
3.4 KiB
C
/* low level locking for pthread library. Generic futex-using version.
|
|
Copyright (C) 2003, 2005, 2007 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <sysdep.h>
|
|
#include <lowlevellock.h>
|
|
#include <sys/time.h>
|
|
|
|
void
|
|
__lll_lock_wait_private (int *futex)
|
|
{
|
|
do
|
|
{
|
|
int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
|
|
if (oldval != 0)
|
|
lll_futex_wait (futex, 2, LLL_PRIVATE);
|
|
}
|
|
while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
|
|
}
|
|
|
|
|
|
/* These functions don't get included in libc.so */
|
|
#ifdef IS_IN_libpthread
|
|
void
|
|
__lll_lock_wait (int *futex, int private)
|
|
{
|
|
do
|
|
{
|
|
int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
|
|
if (oldval != 0)
|
|
lll_futex_wait (futex, 2, private);
|
|
}
|
|
while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
|
|
}
|
|
|
|
|
|
int
|
|
__lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
|
|
{
|
|
struct timespec rt;
|
|
|
|
/* Reject invalid timeouts. */
|
|
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
|
|
return EINVAL;
|
|
|
|
/* Upgrade the lock. */
|
|
if (atomic_exchange_acq (futex, 2) == 0)
|
|
return 0;
|
|
|
|
do
|
|
{
|
|
struct timeval tv;
|
|
|
|
/* Get the current time. */
|
|
(void) __gettimeofday (&tv, NULL);
|
|
|
|
/* Compute relative timeout. */
|
|
rt.tv_sec = abstime->tv_sec - tv.tv_sec;
|
|
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
|
|
if (rt.tv_nsec < 0)
|
|
{
|
|
rt.tv_nsec += 1000000000;
|
|
--rt.tv_sec;
|
|
}
|
|
|
|
/* Already timed out? */
|
|
if (rt.tv_sec < 0)
|
|
return ETIMEDOUT;
|
|
|
|
// XYZ: Lost the lock to check whether it was private.
|
|
lll_futex_timed_wait (futex, 2, &rt, private);
|
|
}
|
|
while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
__lll_timedwait_tid (int *tidp, const struct timespec *abstime)
|
|
{
|
|
int tid;
|
|
|
|
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
|
|
return EINVAL;
|
|
|
|
/* Repeat until thread terminated. */
|
|
while ((tid = *tidp) != 0)
|
|
{
|
|
struct timeval tv;
|
|
struct timespec rt;
|
|
|
|
/* Get the current time. */
|
|
(void) __gettimeofday (&tv, NULL);
|
|
|
|
/* Compute relative timeout. */
|
|
rt.tv_sec = abstime->tv_sec - tv.tv_sec;
|
|
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
|
|
if (rt.tv_nsec < 0)
|
|
{
|
|
rt.tv_nsec += 1000000000;
|
|
--rt.tv_sec;
|
|
}
|
|
|
|
/* Already timed out? */
|
|
if (rt.tv_sec < 0)
|
|
return ETIMEDOUT;
|
|
|
|
/* Wait until thread terminates. */
|
|
// XYZ: Lost the lock to check whether it was private.
|
|
if (lll_futex_timed_wait (tidp, tid, &rt, LLL_SHARED) == -ETIMEDOUT)
|
|
return ETIMEDOUT;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#endif
|