[PATCH 6/6] htl: move pthread_setcanceltype into libc.
Samuel Thibault
samuel.thibault@aquilenet.fr
Wed Jan 29 12:59:35 GMT 2025
BTW, we'll want to move pthread_setcancelstate too ;)
Samuel
gfleury, le ven. 03 janv. 2025 12:37:50 +0200, a ecrit:
> ---
> htl/Makefile | 2 +-
> htl/Versions | 3 ++-
> htl/forward.c | 2 --
> htl/pt-initialize.c | 1 -
> htl/pt-setcanceltype.c | 8 ++++++--
> sysdeps/htl/pthread-functions.h | 2 --
> sysdeps/htl/pthreadP.h | 3 +++
> sysdeps/mach/hurd/i386/libc.abilist | 1 +
> sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
> sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 -
> 10 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/htl/Makefile b/htl/Makefile
> index 5c81e05c..e8e99669 100644
> --- a/htl/Makefile
> +++ b/htl/Makefile
> @@ -51,7 +51,6 @@ libpthread-routines := \
> pt-spin-inlines \
> pt-cleanup \
> pt-setcancelstate \
> - pt-setcanceltype \
> pt-testcancel \
> pt-cancel \
> pt-mutex-transfer-np \
> @@ -204,6 +203,7 @@ routines := \
> pt-nthreads \
> pt-pthread_self \
> pt-self pt-equal \
> + pt-setcanceltype \
> pt-setschedparam \
> pt-sigmask \
> pt-sigstate \
> diff --git a/htl/Versions b/htl/Versions
> index 415faf15..1185bbf4 100644
> --- a/htl/Versions
> +++ b/htl/Versions
> @@ -56,6 +56,7 @@ libc {
> pthread_mutexattr_setprotocol;
> pthread_mutexattr_setpshared;
> pthread_mutexattr_settype;
> + pthread_setcanceltype;
> pthread_sigmask;
> }
>
> @@ -227,7 +228,7 @@ libpthread {
> pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared;
> pthread_rwlockattr_init; pthread_rwlockattr_setpshared;
>
> - pthread_setcancelstate; pthread_setcanceltype;
> + pthread_setcancelstate;
> pthread_setconcurrency;
> pthread_setschedprio; pthread_setspecific;
>
> diff --git a/htl/forward.c b/htl/forward.c
> index 63690291..9455df73 100644
> --- a/htl/forward.c
> +++ b/htl/forward.c
> @@ -62,7 +62,5 @@ FORWARD (__pthread_setcancelstate, (int state, int *oldstate),
> (state, oldstate), 0)
> strong_alias (__pthread_setcancelstate, pthread_setcancelstate);
>
> -FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
> -
> FORWARD2 (__pthread_get_cleanup_stack, struct __pthread_cancelation_handler **,
> (void), (), return &__pthread_cleanup_stack);
> diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
> index 5854bc49..eba9e12d 100644
> --- a/htl/pt-initialize.c
> +++ b/htl/pt-initialize.c
> @@ -29,7 +29,6 @@
> static const struct pthread_functions pthread_functions = {
> .ptr___pthread_exit = __pthread_exit,
> .ptr___pthread_setcancelstate = __pthread_setcancelstate,
> - .ptr_pthread_setcanceltype = __pthread_setcanceltype,
> .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack,
> .ptr_pthread_once = __pthread_once,
> .ptr_pthread_rwlock_rdlock = __pthread_rwlock_rdlock,
> diff --git a/htl/pt-setcanceltype.c b/htl/pt-setcanceltype.c
> index f9474f9c..0b76fbfb 100644
> --- a/htl/pt-setcanceltype.c
> +++ b/htl/pt-setcanceltype.c
> @@ -17,7 +17,7 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <pthread.h>
> -
> +#include <shlib-compat.h>
> #include <pt-internal.h>
>
> int
> @@ -42,5 +42,9 @@ __pthread_setcanceltype (int type, int *oldtype)
>
> return 0;
> }
> +libc_hidden_def (__pthread_setcanceltype)
> +versioned_symbol (libc, __pthread_setcanceltype, pthread_setcanceltype, GLIBC_2_21);
>
> -weak_alias (__pthread_setcanceltype, pthread_setcanceltype);
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
> +compat_symbol (libc, __pthread_setcanceltype, pthread_setcanceltype, GLIBC_2_12);
> +#endif
> diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
> index 45f15c26..9788085b 100644
> --- a/sysdeps/htl/pthread-functions.h
> +++ b/sysdeps/htl/pthread-functions.h
> @@ -23,7 +23,6 @@
>
> void __pthread_exit (void *) __attribute__ ((__noreturn__));
> int __pthread_setcancelstate (int, int *);
> -int __pthread_setcanceltype (int, int *);
> struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
> int __pthread_once (pthread_once_t *, void (*) (void));
> int __pthread_rwlock_rdlock (pthread_rwlock_t *);
> @@ -44,7 +43,6 @@ struct pthread_functions
> {
> void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
> int (*ptr___pthread_setcancelstate) (int, int *);
> - int (*ptr_pthread_setcanceltype) (int, int *);
> struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void);
> int (*ptr_pthread_once) (pthread_once_t *, void (*) (void));
> int (*ptr_pthread_rwlock_rdlock) (pthread_rwlock_t *);
> diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
> index 239caf36..e0a58ea1 100644
> --- a/sysdeps/htl/pthreadP.h
> +++ b/sysdeps/htl/pthreadP.h
> @@ -117,6 +117,9 @@ extern int __pthread_cond_clockwait (pthread_cond_t *cond,
> libc_hidden_proto (__pthread_cond_clockwait);
> extern int __pthread_cond_destroy (pthread_cond_t *cond);
> libc_hidden_proto (__pthread_cond_destroy);
> +
> +extern int __pthread_setcanceltype (int __type, int *__oldtype);
> +libc_hidden_proto (__pthread_setcanceltype);
> extern int __pthread_sigmask (int, const sigset_t *, sigset_t *);
> libc_hidden_proto (__pthread_sigmask);
>
> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
> index 5916f47c..3b55f9d0 100644
> --- a/sysdeps/mach/hurd/i386/libc.abilist
> +++ b/sysdeps/mach/hurd/i386/libc.abilist
> @@ -82,6 +82,7 @@ GLIBC_2.12 pthread_mutexattr_setprotocol F
> GLIBC_2.12 pthread_mutexattr_setpshared F
> GLIBC_2.12 pthread_mutexattr_settype F
> GLIBC_2.12 pthread_self F
> +GLIBC_2.12 pthread_setcanceltype F
> GLIBC_2.12 pthread_setschedparam F
> GLIBC_2.12 pthread_sigmask F
> GLIBC_2.13 __fentry__ F
> diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
> index 0877c0a8..30b598ff 100644
> --- a/sysdeps/mach/hurd/i386/libpthread.abilist
> +++ b/sysdeps/mach/hurd/i386/libpthread.abilist
> @@ -57,7 +57,6 @@ GLIBC_2.12 pthread_rwlockattr_getpshared F
> GLIBC_2.12 pthread_rwlockattr_init F
> GLIBC_2.12 pthread_rwlockattr_setpshared F
> GLIBC_2.12 pthread_setcancelstate F
> -GLIBC_2.12 pthread_setcanceltype F
> GLIBC_2.12 pthread_setconcurrency F
> GLIBC_2.12 pthread_setschedprio F
> GLIBC_2.12 pthread_setspecific F
> diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
> index f4cee895..800b7935 100644
> --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
> +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
> @@ -79,7 +79,6 @@ GLIBC_2.38 pthread_rwlockattr_getpshared F
> GLIBC_2.38 pthread_rwlockattr_init F
> GLIBC_2.38 pthread_rwlockattr_setpshared F
> GLIBC_2.38 pthread_setcancelstate F
> -GLIBC_2.38 pthread_setcanceltype F
> GLIBC_2.38 pthread_setconcurrency F
> GLIBC_2.38 pthread_setschedprio F
> GLIBC_2.38 pthread_setspecific F
> --
> 2.39.5
>
--
Samuel
#ifndef I_WISH_WORLD_WERE_PERFECT
/* It is not :-( All the routers (except for Linux) return only
...
-+- linux/net/ipv4/ipip.c -+-
More information about the Libc-alpha
mailing list