mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Replace lll_timedwait with __futex_abstimed_wait64

Browse Source 
Checked with x86_64-linux-gnu and i686-linux-gnu.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Adhemerval Zanella 2020-11-22 18:55:03 -03:00
parent a3e7aead03
commit 5289cec4b8
4 changed files with 2 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nptl/Makefile
View File

@ -147,7 +147,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
pt-longjmp pt-cleanup\
cancellation \
lowlevellock \
lll_timedlock_wait \
pt-fork pt-fcntl \
$(pthread-compat-wrappers) \
pt-raise pt-system \

62
nptl/lll_timedlock_wait.c
View File

@ -1,62 +0,0 @@
/* Timed low level locking for pthread library. Generic futex-using version.
Copyright (C) 2003-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
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 <atomic.h>
#include <errno.h>
#include <lowlevellock.h>
#include <sys/time.h>
#include <time.h>
int
__lll_clocklock_wait (int *futex, int val, clockid_t clockid,
const struct timespec *abstime, int private)
{
struct timespec ts, *tsp = NULL;
if (abstime != NULL)
{
/* Reject invalid timeouts. */
if (! valid_nanoseconds (abstime->tv_nsec))
return EINVAL;
/* Get the current time. This can only fail if clockid is not valid. */
if (__glibc_unlikely (__clock_gettime (clockid, &ts) != 0))
return EINVAL;
/* Compute relative timeout. */
ts.tv_sec = abstime->tv_sec - ts.tv_sec;
ts.tv_nsec = abstime->tv_nsec - ts.tv_nsec;
if (ts.tv_nsec < 0)
{
ts.tv_nsec += 1000000000;
--ts.tv_sec;
}
if (ts.tv_sec < 0)
return ETIMEDOUT;
tsp = &ts;
}
/* If *futex == val, wait until woken or timeout. */
lll_futex_timed_wait (futex, val, tsp, private);
return 0;
}

4
nptl/pthread_mutex_lock.c
View File

@ -425,8 +425,8 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
/* Delay the thread indefinitely. */
while (1)
lll_timedwait (&(int){0}, 0, 0 /* ignored */, NULL,
private);
__futex_abstimed_wait64 (&(unsigned int){0}, 0,
0 /* ignored */, NULL, private);
}
oldval = mutex->__data.__lock;

32
sysdeps/nptl/lowlevellock.h
View File

@ -122,38 +122,6 @@ extern void __lll_lock_wait (int *futex, int private) attribute_hidden;
#define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private)
extern int __lll_clocklock_wait (int *futex, int val, clockid_t,
const struct timespec *,
int private) attribute_hidden;
#define lll_timedwait(futex, val, clockid, abstime, private) \
__lll_clocklock_wait (futex, val, clockid, abstime, private)
/* As __lll_lock, but with an absolute timeout measured against the clock
specified in CLOCKID. If the timeout occurs then return ETIMEDOUT. If
ABSTIME is invalid, return EINVAL. */
#define __lll_clocklock(futex, clockid, abstime, private) \
({ \
int *__futex = (futex); \
int __val = 0; \
\
if (__glibc_unlikely \
(atomic_compare_and_exchange_bool_acq (__futex, 1, 0))) \
{ \
while (atomic_exchange_acq (futex, 2) != 0) \
{ \
__val = __lll_clocklock_wait (__futex, 2, clockid, \
abstime, private); \
if (__val == EINVAL || __val == ETIMEDOUT) \
break; \
} \
} \
__val; \
})
#define lll_clocklock(futex, clockid, abstime, private) \
__lll_clocklock (&(futex), clockid, abstime, private)
/* This is an expression rather than a statement even though its value is
void, so that it can be used in a comma expression or as an expression
that's cast to void. */