lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

nptl: Rename lll_timedlock to lll_clocklock and add clockid parameter

Browse Source 
Rename lll_timedlock to lll_clocklock and add clockid
parameter to indicate the clock that the abstime parameter should
be measured against in preparation for adding
pthread_mutex_clocklock.

The name change mirrors the naming for the exposed pthread functions:

 timed => absolute timeout measured against CLOCK_REALTIME (or clock
          specified by attribute in the case of pthread_cond_timedwait.)

 clock => absolute timeout measured against clock specified in preceding
          parameter.

	* sysdeps/nptl/lowlevellock.h (lll_clocklock): Rename from
	lll_timedlock and add clockid parameter. (__lll_clocklock): Rename
	from __lll_timedlock and add clockid parameter.
	* sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_clocklock):
	Likewise.
	* nptl/lll_timedlock_wait.c (__lll_clocklock_wait): Rename from
	__lll_timedlock_wait and add clockid parameter. Use __clock_gettime
	rather than __gettimeofday so that clockid can be used. This means
	that conversion from struct timeval is no longer required.
	* sysdeps/sparc/sparc32/lowlevellock.c (lll_clocklock_wait):
	Likewise.
	* sysdeps/sparc/sparc32/lll_timedlock_wait.c: Update comment to
	refer to __lll_clocklock_wait rather than __lll_timedlock_wait.
	* nptl/pthread_mutex_timedlock.c (lll_clocklock_elision): Rename
	from lll_timedlock_elision, add clockid parameter and use
	meaningful names for other parameters. (__pthread_mutex_timedlock):
	Pass CLOCK_REALTIME where necessary to lll_clocklock and
	lll_clocklock_elision.
	* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
	(lll_clocklock_elision): Rename from lll_timedlock_elision and add
	clockid parameter. (__lll_clocklock_elision): Rename from
	__lll_timedlock_elision and add clockid parameter.
	* sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
	* sysdeps/unix/sysv/linux/x86/lowlevellock.h: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/elision-timed.c
	(__lll_lock_elision): Call __lll_clocklock_elision rather than
	__lll_timedlock_elision. (EXTRAARG): Add clockid parameter.
	(LLL_LOCK): Likewise.
	* sysdeps/unix/sysv/linux/s390/elision-timed.c: Likewise.
	* sysdeps/unix/sysv/linux/x86/elision-timed.c: Likewise.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Mike Crowe
2019-06-24 13:08:25 +00:00
committed by Adhemerval Zanella
parent e996fa72a9
commit 59213094c8
13 changed files with 103 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ChangeLog
View File

@ -1,5 +1,40 @@
2019-07-12 Mike Crowe <mac@mcrowe.com> 2019-07-12 Mike Crowe <mac@mcrowe.com>
nptl: Rename lll_timedlock to lll_clocklock and add clockid
parameter to indicate the clock that the abstime parameter should
be measured against in preparation for adding
pthread_mutex_clocklock.
* sysdeps/nptl/lowlevellock.h (lll_clocklock): Rename from
lll_timedlock and add clockid parameter. (__lll_clocklock): Rename
from __lll_timedlock and add clockid parameter.
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_clocklock):
Likewise.
* nptl/lll_timedlock_wait.c (__lll_clocklock_wait): Rename from
__lll_timedlock_wait and add clockid parameter. Use __clock_gettime
rather than __gettimeofday so that clockid can be used. This means
that conversion from struct timeval is no longer required.
* sysdeps/sparc/sparc32/lowlevellock.c (lll_clocklock_wait):
Likewise.
* sysdeps/sparc/sparc32/lll_timedlock_wait.c: Update comment to
refer to __lll_clocklock_wait rather than __lll_timedlock_wait.
* nptl/pthread_mutex_timedlock.c (lll_clocklock_elision): Rename
from lll_timedlock_elision, add clockid parameter and use
meaningful names for other parameters. (__pthread_mutex_timedlock):
Pass CLOCK_REALTIME where necessary to lll_clocklock and
lll_clocklock_elision.
* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
(lll_clocklock_elision): Rename from lll_timedlock_elision and add
clockid parameter. (__lll_clocklock_elision): Rename from
__lll_timedlock_elision and add clockid parameter.
* sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/x86/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/elision-timed.c
(__lll_lock_elision): Call __lll_clocklock_elision rather than
__lll_timedlock_elision. (EXTRAARG): Add clockid parameter.
(LLL_LOCK): Likewise.
* sysdeps/unix/sysv/linux/s390/elision-timed.c: Likewise.
* sysdeps/unix/sysv/linux/x86/elision-timed.c: Likewise.
nptl: Add POSIX-proposed pthread_rwlock_clockrdlock & nptl: Add POSIX-proposed pthread_rwlock_clockrdlock &
pthread_rwlock_clockwrlock which behave like pthread_rwlock_clockwrlock which behave like
pthread_rwlock_timedrdlock and pthread_rwlock_timedwrlock pthread_rwlock_timedrdlock and pthread_rwlock_timedwrlock

15
nptl/lll_timedlock_wait.c
View File

@ -24,7 +24,8 @@
int int
__lll_timedlock_wait (int *futex, const struct timespec *abstime, int private) __lll_clocklock_wait (int *futex, clockid_t clockid,
const struct timespec *abstime, int private)
{ {
/* Reject invalid timeouts. */ /* Reject invalid timeouts. */
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
@ -33,15 +34,17 @@ __lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
/* Try locking. */ /* Try locking. */
while (atomic_exchange_acq (futex, 2) != 0) while (atomic_exchange_acq (futex, 2) != 0)
{ {
struct timeval tv; struct timespec ts;
/* Get the current time. */ /* Get the current time. This can only fail if clockid is not
(void) __gettimeofday (&tv, NULL); valid. */
if (__glibc_unlikely (__clock_gettime (clockid, &ts) != 0))
return EINVAL;
/* Compute relative timeout. */ /* Compute relative timeout. */
struct timespec rt; struct timespec rt;
rt.tv_sec = abstime->tv_sec - tv.tv_sec; rt.tv_sec = abstime->tv_sec - ts.tv_sec;
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000; rt.tv_nsec = abstime->tv_nsec - ts.tv_nsec;
if (rt.tv_nsec < 0) if (rt.tv_nsec < 0)
{ {
rt.tv_nsec += 1000000000; rt.tv_nsec += 1000000000;

16
nptl/pthread_mutex_timedlock.c
View File

@ -28,8 +28,9 @@
#include <stap-probe.h> #include <stap-probe.h>
#ifndef lll_timedlock_elision #ifndef lll_clocklock_elision
#define lll_timedlock_elision(a,dummy,b,c) lll_timedlock(a, b, c) #define lll_clocklock_elision(futex, adapt_count, clockid, abstime, private) \
lll_clocklock (futex, clockid, abstime, private)
#endif #endif
#ifndef lll_trylock_elision #ifndef lll_trylock_elision
@ -75,7 +76,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex,
} }
/* We have to get the mutex. */ /* We have to get the mutex. */
result = lll_timedlock (mutex->__data.__lock, abstime, result = lll_clocklock (mutex->__data.__lock, CLOCK_REALTIME, abstime,
PTHREAD_MUTEX_PSHARED (mutex)); PTHREAD_MUTEX_PSHARED (mutex));
if (result != 0) if (result != 0)
@ -98,16 +99,16 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex,
FORCE_ELISION (mutex, goto elision); FORCE_ELISION (mutex, goto elision);
simple: simple:
/* Normal mutex. */ /* Normal mutex. */
result = lll_timedlock (mutex->__data.__lock, abstime, result = lll_clocklock (mutex->__data.__lock, CLOCK_REALTIME, abstime,
PTHREAD_MUTEX_PSHARED (mutex)); PTHREAD_MUTEX_PSHARED (mutex));
break; break;
case PTHREAD_MUTEX_TIMED_ELISION_NP: case PTHREAD_MUTEX_TIMED_ELISION_NP:
elision: __attribute__((unused)) elision: __attribute__((unused))
/* Don't record ownership */ /* Don't record ownership */
return lll_timedlock_elision (mutex->__data.__lock, return lll_clocklock_elision (mutex->__data.__lock,
mutex->__data.__spins, mutex->__data.__spins,
abstime, CLOCK_REALTIME, abstime,
PTHREAD_MUTEX_PSHARED (mutex)); PTHREAD_MUTEX_PSHARED (mutex));
@ -124,7 +125,8 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex,
{ {
if (cnt++ >= max_cnt) if (cnt++ >= max_cnt)
{ {
result = lll_timedlock (mutex->__data.__lock, abstime, result = lll_clocklock (mutex->__data.__lock,
CLOCK_REALTIME, abstime,
PTHREAD_MUTEX_PSHARED (mutex)); PTHREAD_MUTEX_PSHARED (mutex));
break; break;
} }

16
sysdeps/nptl/lowlevellock.h
View File

@ -121,24 +121,26 @@ extern void __lll_lock_wait (int *futex, int private) attribute_hidden;
#define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private)
extern int __lll_timedlock_wait (int *futex, const struct timespec *, extern int __lll_clocklock_wait (int *futex, clockid_t,
const struct timespec *,
int private) attribute_hidden; int private) attribute_hidden;
/* As __lll_lock, but with a timeout. If the timeout occurs then return /* As __lll_lock, but with an absolute timeout measured against the clock
ETIMEDOUT. If ABSTIME is invalid, return EINVAL. */ specified in CLOCKID. If the timeout occurs then return ETIMEDOUT. If
#define __lll_timedlock(futex, abstime, private) \ ABSTIME is invalid, return EINVAL. */
#define __lll_clocklock(futex, clockid, abstime, private) \
({ \ ({ \
int *__futex = (futex); \ int *__futex = (futex); \
int __val = 0; \ int __val = 0; \
\ \
if (__glibc_unlikely \ if (__glibc_unlikely \
(atomic_compare_and_exchange_bool_acq (__futex, 1, 0))) \ (atomic_compare_and_exchange_bool_acq (__futex, 1, 0))) \
__val = __lll_timedlock_wait (__futex, abstime, private); \ __val = __lll_clocklock_wait (__futex, clockid, abstime, private); \
__val; \ __val; \
}) })
#define lll_timedlock(futex, abstime, private) \ #define lll_clocklock(futex, clockid, abstime, private) \
__lll_timedlock (&(futex), abstime, private) __lll_clocklock (&(futex), clockid, abstime, private)
/* This is an expression rather than a statement even though its value is /* This is an expression rather than a statement even though its value is

2
sysdeps/sparc/sparc32/lll_timedlock_wait.c
View File

@ -1 +1 @@
/* __lll_timedlock_wait is in lowlevellock.c. */ /* __lll_clocklock_wait is in lowlevellock.c. */

15
sysdeps/sparc/sparc32/lowlevellock.c
View File

@ -52,7 +52,8 @@ __lll_lock_wait (int *futex, int private)
int int
__lll_timedlock_wait (int *futex, const struct timespec *abstime, int private) __lll_clocklock_wait (int *futex, clockid_t clockid,
const struct timespec *abstime, int private)
{ {
/* Reject invalid timeouts. */ /* Reject invalid timeouts. */
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
@ -60,15 +61,17 @@ __lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
do do
{ {
struct timeval tv; struct timespec ts;
struct timespec rt; struct timespec rt;
/* Get the current time. */ /* Get the current time. This can only fail if clockid is not
(void) __gettimeofday (&tv, NULL); valid. */
if (__glibc_unlikely (__clock_gettime (clockid, &ts) != 0))
return EINVAL;
/* Compute relative timeout. */ /* Compute relative timeout. */
rt.tv_sec = abstime->tv_sec - tv.tv_sec; rt.tv_sec = abstime->tv_sec - ts.tv_sec;
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000; rt.tv_nsec = abstime->tv_nsec - ts.tv_nsec;
if (rt.tv_nsec < 0) if (rt.tv_nsec < 0)
{ {
rt.tv_nsec += 1000000000; rt.tv_nsec += 1000000000;

6
sysdeps/unix/sysv/linux/powerpc/elision-timed.c
View File

@ -20,9 +20,9 @@
#include <elision-conf.h> #include <elision-conf.h>
#include "lowlevellock.h" #include "lowlevellock.h"
#define __lll_lock_elision __lll_timedlock_elision #define __lll_lock_elision __lll_clocklock_elision
#define EXTRAARG const struct timespec *t, #define EXTRAARG clockid_t clockid, const struct timespec *t,
#undef LLL_LOCK #undef LLL_LOCK
#define LLL_LOCK(a, b) lll_timedlock(a, t, b) #define LLL_LOCK(a, b) lll_clocklock(a, clockid, t, b)
#include "elision-lock.c" #include "elision-lock.c"

9
sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
View File

@ -22,12 +22,13 @@
#include <sysdeps/nptl/lowlevellock.h> #include <sysdeps/nptl/lowlevellock.h>
/* Transactional lock elision definitions. */ /* Transactional lock elision definitions. */
extern int __lll_timedlock_elision extern int __lll_clocklock_elision
(int *futex, short *adapt_count, const struct timespec *timeout, int private) (int *futex, short *adapt_count,
clockid_t clockid, const struct timespec *timeout, int private)
attribute_hidden; attribute_hidden;
#define lll_timedlock_elision(futex, adapt_count, timeout, private) \ #define lll_clocklock_elision(futex, adapt_count, clockid, timeout, private) \
__lll_timedlock_elision(&(futex), &(adapt_count), timeout, private) __lll_clocklock_elision (&(futex), &(adapt_count), clockid, timeout, private)
extern int __lll_lock_elision (int *futex, short *adapt_count, int private) extern int __lll_lock_elision (int *futex, short *adapt_count, int private)
attribute_hidden; attribute_hidden;

6
sysdeps/unix/sysv/linux/s390/elision-timed.c
View File

@ -19,8 +19,8 @@
#include <time.h> #include <time.h>
#include <elision-conf.h> #include <elision-conf.h>
#include <lowlevellock.h> #include <lowlevellock.h>
#define __lll_lock_elision __lll_timedlock_elision #define __lll_lock_elision __lll_clocklock_elision
#define EXTRAARG const struct timespec *t, #define EXTRAARG clockid_t clockid, const struct timespec *t,
#undef LLL_LOCK #undef LLL_LOCK
#define LLL_LOCK(a, b) lll_timedlock(a, t, b) #define LLL_LOCK(a, b) lll_clocklock(a, clockid, t, b)
#include "elision-lock.c" #include "elision-lock.c"

9
sysdeps/unix/sysv/linux/s390/lowlevellock.h
View File

@ -22,12 +22,13 @@
#include <sysdeps/nptl/lowlevellock.h> #include <sysdeps/nptl/lowlevellock.h>
/* Transactional lock elision definitions. */ /* Transactional lock elision definitions. */
extern int __lll_timedlock_elision extern int __lll_clocklock_elision
(int *futex, short *adapt_count, const struct timespec *timeout, int private) (int *futex, short *adapt_count,
clockid_t clockid, const struct timespec *timeout, int private)
attribute_hidden; attribute_hidden;
# define lll_timedlock_elision(futex, adapt_count, timeout, private) \ # define lll_clocklock_elision(futex, adapt_count, clockid, timeout, private) \
__lll_timedlock_elision(&(futex), &(adapt_count), timeout, private) __lll_clocklock_elision (&(futex), &(adapt_count), clockid, timeout, private)
extern int __lll_lock_elision (int *futex, short *adapt_count, int private) extern int __lll_lock_elision (int *futex, short *adapt_count, int private)
attribute_hidden; attribute_hidden;

11
sysdeps/unix/sysv/linux/sparc/lowlevellock.h
View File

@ -75,22 +75,23 @@ __lll_cond_lock (int *futex, int private)
#define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private)
extern int __lll_timedlock_wait (int *futex, const struct timespec *, extern int __lll_clocklock_wait (int *futex, clockid_t, const struct timespec *,
int private) attribute_hidden; int private) attribute_hidden;
static inline int static inline int
__attribute__ ((always_inline)) __attribute__ ((always_inline))
__lll_timedlock (int *futex, const struct timespec *abstime, int private) __lll_clocklock (int *futex, clockid_t clockid,
const struct timespec *abstime, int private)
{ {
int val = atomic_compare_and_exchange_val_24_acq (futex, 1, 0); int val = atomic_compare_and_exchange_val_24_acq (futex, 1, 0);
int result = 0; int result = 0;
if (__glibc_unlikely (val != 0)) if (__glibc_unlikely (val != 0))
result = __lll_timedlock_wait (futex, abstime, private); result = __lll_clocklock_wait (futex, clockid, abstime, private);
return result; return result;
} }
#define lll_timedlock(futex, abstime, private) \ #define lll_clocklock(futex, clockid, abstime, private) \
__lll_timedlock (&(futex), abstime, private) __lll_clocklock (&(futex), clockid, abstime, private)
#define lll_unlock(lock, private) \ #define lll_unlock(lock, private) \
((void) ({ \ ((void) ({ \

6
sysdeps/unix/sysv/linux/x86/elision-timed.c
View File

@ -19,8 +19,8 @@
#include <time.h> #include <time.h>
#include <elision-conf.h> #include <elision-conf.h>
#include "lowlevellock.h" #include "lowlevellock.h"
#define __lll_lock_elision __lll_timedlock_elision #define __lll_lock_elision __lll_clocklock_elision
#define EXTRAARG const struct timespec *t, #define EXTRAARG clockid_t clockid, const struct timespec *t,
#undef LLL_LOCK #undef LLL_LOCK
#define LLL_LOCK(a, b) lll_timedlock(a, t, b) #define LLL_LOCK(a, b) lll_clocklock (a, clockid, t, b)
#include "elision-lock.c" #include "elision-lock.c"

11
sysdeps/unix/sysv/linux/x86/lowlevellock.h
View File

@ -82,12 +82,13 @@ __lll_cas_lock (int *futex)
__lll_unlock (&(lock), private); \ __lll_unlock (&(lock), private); \
})) }))
extern int __lll_timedlock_elision (int *futex, short *adapt_count, extern int __lll_clocklock_elision (int *futex, short *adapt_count,
const struct timespec *timeout, clockid_t clockid,
int private) attribute_hidden; const struct timespec *timeout,
int private) attribute_hidden;
#define lll_timedlock_elision(futex, adapt_count, timeout, private) \ #define lll_clocklock_elision(futex, adapt_count, clockid, timeout, private) \
__lll_timedlock_elision(&(futex), &(adapt_count), timeout, private) __lll_clocklock_elision (&(futex), &(adapt_count), clockid, timeout, private)
extern int __lll_lock_elision (int *futex, short *adapt_count, int private) extern int __lll_lock_elision (int *futex, short *adapt_count, int private)
attribute_hidden; attribute_hidden;