[v3,21/37] Remove pthread_key_create-related internals from libc-lock.h
Commit Message
And libc-lockP.h. This is no longer used because all internal
TLS use goes directly to the thread descriptor/TCB or uses ELF TLS.
---
sysdeps/generic/libc-lock.h | 12 ------------
sysdeps/htl/libc-lockP.h | 13 -------------
sysdeps/nptl/libc-lockP.h | 24 ------------------------
3 files changed, 49 deletions(-)
Comments
On 16/03/2021 14:30, Florian Weimer via Libc-alpha wrote:
> And libc-lockP.h. This is no longer used because all internal
> TLS use goes directly to the thread descriptor/TCB or uses ELF TLS.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> sysdeps/generic/libc-lock.h | 12 ------------
> sysdeps/htl/libc-lockP.h | 13 -------------
> sysdeps/nptl/libc-lockP.h | 24 ------------------------
> 3 files changed, 49 deletions(-)
>
> diff --git a/sysdeps/generic/libc-lock.h b/sysdeps/generic/libc-lock.h
> index 6b1e98e34d..c538e858ea 100644
> --- a/sysdeps/generic/libc-lock.h
> +++ b/sysdeps/generic/libc-lock.h
> @@ -125,16 +125,4 @@
> /* We need portable names for some of the functions. */
> #define __libc_mutex_unlock
>
> -/* Type for key of thread specific data. */
> -typedef int __libc_key_t;
> -
> -/* Create key for thread specific data. */
> -#define __libc_key_create(KEY,DEST) ((void) (KEY), (void) (DEST), -1)
> -
> -/* Set thread-specific data associated with KEY to VAL. */
> -#define __libc_setspecific(KEY,VAL) ((void) (KEY), (void) (VAL))
> -
> -/* Get thread-specific data associated with KEY. */
> -#define __libc_getspecific(KEY) ((void) (KEY), (void *) 0)
> -
> #endif /* libc-lock.h */
Ok.
> diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h
> index f183bde680..eb09171c85 100644
> --- a/sysdeps/htl/libc-lockP.h
> +++ b/sysdeps/htl/libc-lockP.h
> @@ -22,9 +22,6 @@
> #include <pthread.h>
> #include <pthread-functions.h>
>
> -/* Type for key to thread-specific data. */
> -typedef pthread_key_t __libc_key_t;
> -
> /* If we check for a weakly referenced symbol and then perform a
> normal jump to it te code generated for some platforms in case of
> PIC is unnecessarily slow. What would happen is that the function
> @@ -109,16 +106,6 @@ extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
>
> extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
>
> -extern int __pthread_key_create (pthread_key_t *__key,
> - void (*__destr_function) (void *));
> -
> -extern int __pthread_key_delete (pthread_key_t __key);
> -
> -extern int __pthread_setspecific (pthread_key_t __key,
> - const void *__pointer);
> -
> -extern void *__pthread_getspecific (pthread_key_t __key);
> -
> extern int __pthread_once (pthread_once_t *__once_control,
> void (*__init_routine) (void));
>
Ok.
> diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h
> index df62ce0e61..d032463dd0 100644
> --- a/sysdeps/nptl/libc-lockP.h
> +++ b/sysdeps/nptl/libc-lockP.h
> @@ -49,9 +49,6 @@ typedef int __libc_lock_t;
> typedef struct { pthread_mutex_t mutex; } __rtld_lock_recursive_t;
> typedef pthread_rwlock_t __libc_rwlock_t;
>
> -/* Type for key to thread-specific data. */
> -typedef pthread_key_t __libc_key_t;
> -
> /* Define a lock variable NAME with storage class CLASS. The lock must be
> initialized with __libc_lock_init before it can be used (or define it
> with __libc_lock_define_initialized, below). Use `extern' for CLASS to
> @@ -267,19 +264,6 @@ __libc_cleanup_routine (struct __pthread_cleanup_frame *f)
> } while (0)
> #endif /* __EXCEPTIONS */
>
> -/* Create thread-specific key. */
> -#define __libc_key_create(KEY, DESTRUCTOR) \
> - __libc_ptf_call (__pthread_key_create, (KEY, DESTRUCTOR), 1)
> -
> -/* Get thread-specific data. */
> -#define __libc_getspecific(KEY) \
> - __libc_ptf_call (__pthread_getspecific, (KEY), NULL)
> -
> -/* Set thread-specific data. */
> -#define __libc_setspecific(KEY, VALUE) \
> - __libc_ptf_call (__pthread_setspecific, (KEY, VALUE), 0)
> -
> -
> /* Register handlers to execute before and after `fork'. Note that the
> last parameter is NULL. The handlers registered by the libc are
> never removed so this is OK. */
Ok.
> @@ -324,14 +308,6 @@ extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
>
> extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
>
> -extern int __pthread_key_create (pthread_key_t *__key,
> - void (*__destr_function) (void *));
> -
> -extern int __pthread_setspecific (pthread_key_t __key,
> - const void *__pointer);
> -
> -extern void *__pthread_getspecific (pthread_key_t __key);
> -
> extern int __pthread_once (pthread_once_t *__once_control,
> void (*__init_routine) (void));
> libc_hidden_proto (__pthread_once)
>
Ok.
@@ -125,16 +125,4 @@
/* We need portable names for some of the functions. */
#define __libc_mutex_unlock
-/* Type for key of thread specific data. */
-typedef int __libc_key_t;
-
-/* Create key for thread specific data. */
-#define __libc_key_create(KEY,DEST) ((void) (KEY), (void) (DEST), -1)
-
-/* Set thread-specific data associated with KEY to VAL. */
-#define __libc_setspecific(KEY,VAL) ((void) (KEY), (void) (VAL))
-
-/* Get thread-specific data associated with KEY. */
-#define __libc_getspecific(KEY) ((void) (KEY), (void *) 0)
-
#endif /* libc-lock.h */
@@ -22,9 +22,6 @@
#include <pthread.h>
#include <pthread-functions.h>
-/* Type for key to thread-specific data. */
-typedef pthread_key_t __libc_key_t;
-
/* If we check for a weakly referenced symbol and then perform a
normal jump to it te code generated for some platforms in case of
PIC is unnecessarily slow. What would happen is that the function
@@ -109,16 +106,6 @@ extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
-extern int __pthread_key_create (pthread_key_t *__key,
- void (*__destr_function) (void *));
-
-extern int __pthread_key_delete (pthread_key_t __key);
-
-extern int __pthread_setspecific (pthread_key_t __key,
- const void *__pointer);
-
-extern void *__pthread_getspecific (pthread_key_t __key);
-
extern int __pthread_once (pthread_once_t *__once_control,
void (*__init_routine) (void));
@@ -49,9 +49,6 @@ typedef int __libc_lock_t;
typedef struct { pthread_mutex_t mutex; } __rtld_lock_recursive_t;
typedef pthread_rwlock_t __libc_rwlock_t;
-/* Type for key to thread-specific data. */
-typedef pthread_key_t __libc_key_t;
-
/* Define a lock variable NAME with storage class CLASS. The lock must be
initialized with __libc_lock_init before it can be used (or define it
with __libc_lock_define_initialized, below). Use `extern' for CLASS to
@@ -267,19 +264,6 @@ __libc_cleanup_routine (struct __pthread_cleanup_frame *f)
} while (0)
#endif /* __EXCEPTIONS */
-/* Create thread-specific key. */
-#define __libc_key_create(KEY, DESTRUCTOR) \
- __libc_ptf_call (__pthread_key_create, (KEY, DESTRUCTOR), 1)
-
-/* Get thread-specific data. */
-#define __libc_getspecific(KEY) \
- __libc_ptf_call (__pthread_getspecific, (KEY), NULL)
-
-/* Set thread-specific data. */
-#define __libc_setspecific(KEY, VALUE) \
- __libc_ptf_call (__pthread_setspecific, (KEY, VALUE), 0)
-
-
/* Register handlers to execute before and after `fork'. Note that the
last parameter is NULL. The handlers registered by the libc are
never removed so this is OK. */
@@ -324,14 +308,6 @@ extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
-extern int __pthread_key_create (pthread_key_t *__key,
- void (*__destr_function) (void *));
-
-extern int __pthread_setspecific (pthread_key_t __key,
- const void *__pointer);
-
-extern void *__pthread_getspecific (pthread_key_t __key);
-
extern int __pthread_once (pthread_once_t *__once_control,
void (*__init_routine) (void));
libc_hidden_proto (__pthread_once)