From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Florian Weimer <fweimer@redhat.com>
Subject: Re: [PATCH 07/18] nptl: Move __pthread_cleanup_upto into libc
Date: Tue, 16 Mar 2021 11:35:54 -0300 [thread overview]
Message-ID: <26399434-254d-6f15-894f-618f99f2858d@linaro.org> (raw)
In-Reply-To: <b76ffd692555b9159178b36241b3a3e223ccf4eb.1615569355.git.fweimer@redhat.com>
On 12/03/2021 14:49, Florian Weimer via Libc-alpha wrote:
> This internal symbol is used as part of the longjmp implementation.
> Rename the file from nptl/pt-cleanup.c to nptl/pthread_cleanup_upto.c
> so that the pt-* files remain restricted to libpthread.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> nptl/Makefile | 2 +-
> nptl/Versions | 1 +
> nptl/nptl-init.c | 1 -
> nptl/pthreadP.h | 4 +---
> nptl/{pt-cleanup.c => pthread_cleanup_upto.c} | 2 +-
> sysdeps/nptl/jmp-unwind.c | 8 ++------
> sysdeps/nptl/pthread-functions.h | 1 -
> sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 7 ++-----
> 8 files changed, 8 insertions(+), 18 deletions(-)
> rename nptl/{pt-cleanup.c => pthread_cleanup_upto.c} (98%)
>
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 7e566675f2..8847c4dd49 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -66,6 +66,7 @@ routines = \
> pthread_attr_setscope \
> pthread_attr_setsigmask \
> pthread_attr_setsigmask_internal \
> + pthread_cleanup_upto \
> pthread_cond_destroy \
> pthread_cond_init \
> pthread_condattr_destroy \
> @@ -113,7 +114,6 @@ libpthread-routines = \
> old_pthread_cond_timedwait \
> old_pthread_cond_wait \
> pt-allocrtsig \
> - pt-cleanup \
> pt-fcntl \
> pt-interp \
> pt-raise \
Ok.
> diff --git a/nptl/Versions b/nptl/Versions
> index cf4d5b677d..8fa0d178db 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -109,6 +109,7 @@ libc {
> __pthread_attr_setsigmask_internal;
> __pthread_cleanup_pop;
> __pthread_cleanup_push;
> + __pthread_cleanup_upto;
> __pthread_cond_destroy; # Used by the C11 threads.
> __pthread_cond_init; # Used by the C11 threads.
> __pthread_force_elision;
Ok.
> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index c2b563cc68..41527dcad1 100644
> --- a/nptl/nptl-init.c
> +++ b/nptl/nptl-init.c
> @@ -88,7 +88,6 @@ static const struct pthread_functions pthread_functions =
> .ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
> .ptr___pthread_setcancelstate = __pthread_setcancelstate,
> .ptr_pthread_setcanceltype = __pthread_setcanceltype,
> - .ptr___pthread_cleanup_upto = __pthread_cleanup_upto,
> .ptr___pthread_once = __pthread_once,
> .ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock,
> .ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock,
Ok.
> diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
> index 781bc65c1c..8f3d2cc8c9 100644
> --- a/nptl/pthreadP.h
> +++ b/nptl/pthreadP.h
> @@ -332,9 +332,7 @@ extern int __make_stacks_executable (void **stack_endp) attribute_hidden;
>
> /* longjmp handling. */
> extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
> -#if IS_IN (libpthread)
> -hidden_proto (__pthread_cleanup_upto)
> -#endif
> +libc_hidden_proto (__pthread_cleanup_upto)
>
>
> /* Functions with versioned interfaces. */
Ok.
> diff --git a/nptl/pt-cleanup.c b/nptl/pthread_cleanup_upto.c
> similarity index 98%
> rename from nptl/pt-cleanup.c
> rename to nptl/pthread_cleanup_upto.c
Ok.
> index 541533230d..89da3e5229 100644
> --- a/nptl/pt-cleanup.c
> +++ b/nptl/pthread_cleanup_upto.c
> @@ -59,4 +59,4 @@ __pthread_cleanup_upto (__jmp_buf target, char *targetframe)
>
> THREAD_SETMEM (self, cleanup, cbuf);
> }
> -hidden_def (__pthread_cleanup_upto)
> +libc_hidden_def (__pthread_cleanup_upto)
Ok.
> diff --git a/sysdeps/nptl/jmp-unwind.c b/sysdeps/nptl/jmp-unwind.c
> index a79c792e82..96c4862c74 100644
> --- a/sysdeps/nptl/jmp-unwind.c
> +++ b/sysdeps/nptl/jmp-unwind.c
> @@ -19,14 +19,10 @@
> #include <setjmp.h>
> #include <stddef.h>
> #include <libc-lock.h>
> -
> -extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
> -#pragma weak __pthread_cleanup_upto
> -
> +#include <nptl/pthreadP.h>
>
> void
> _longjmp_unwind (jmp_buf env, int val)
> {
> - __libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf,
> - CURRENT_STACK_FRAME), 0);
> + __pthread_cleanup_upto (env->__jmpbuf, CURRENT_STACK_FRAME);
> }
Ok.
> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 4268084b66..1bbe609598 100644
> --- a/sysdeps/nptl/pthread-functions.h
> +++ b/sysdeps/nptl/pthread-functions.h
> @@ -49,7 +49,6 @@ struct pthread_functions
> int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);
> int (*ptr___pthread_setcancelstate) (int, int *);
> int (*ptr_pthread_setcanceltype) (int, int *);
> - void (*ptr___pthread_cleanup_upto) (__jmp_buf, char *);
> int (*ptr___pthread_once) (pthread_once_t *, void (*) (void));
> int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *);
> int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *);
Ok.
> diff --git a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
> index 2bdde57ec7..8e0399a3e9 100644
> --- a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
> +++ b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
> @@ -19,15 +19,12 @@
> #include <setjmp.h>
> #include <stddef.h>
> #include <libc-lock.h>
> -
> -extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
> -#pragma weak __pthread_cleanup_upto
> -
> +#include <nptl/pthreadP.h>
>
> void
> _longjmp_unwind (jmp_buf env, int val)
> {
> char local_var;
>
> - __libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf, &local_var), 0);
> + __pthread_cleanup_upto (env->__jmpbuf, &local_var);
> }
>
Ok.
next prev parent reply other threads:[~2021-03-16 14:35 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 17:48 [PATCH 00/18] Repost of pending libpthread removal patches Florian Weimer
2021-03-12 17:48 ` [PATCH 01/18] nptl: Move pthread_mutex_consistent into libc Florian Weimer
2021-03-15 19:30 ` Adhemerval Zanella
2021-03-16 5:42 ` Florian Weimer
2021-03-16 13:49 ` Adhemerval Zanella
2021-03-16 13:53 ` Florian Weimer
2021-03-16 14:07 ` Adhemerval Zanella
2021-03-12 17:49 ` [PATCH 02/18] nptl: Move __pthread_cleanup_routine " Florian Weimer
2021-03-15 19:53 ` Adhemerval Zanella
2021-03-16 7:09 ` Florian Weimer
2021-03-12 17:49 ` [PATCH 03/18] nptl: Move legacy unwinding implementation " Florian Weimer
2021-03-15 20:02 ` Adhemerval Zanella
2021-03-16 7:03 ` Florian Weimer
2021-03-12 17:49 ` [PATCH 04/18] nptl: Move legacy cancelation handling into libc as compat symbols Florian Weimer
2021-03-16 14:09 ` Adhemerval Zanella
2021-03-16 14:45 ` Florian Weimer
2021-03-16 18:14 ` Adhemerval Zanella
2021-03-12 17:49 ` [PATCH 05/18] nptl: Remove longjmp, siglongjmp from libpthread Florian Weimer
2021-03-16 14:13 ` Adhemerval Zanella
2021-03-16 14:39 ` Florian Weimer
2021-03-12 17:49 ` [PATCH 06/18] Legacy unwinder: Remove definition of _Unwind_GetCFA Florian Weimer
2021-03-16 14:14 ` Adhemerval Zanella
2021-03-12 17:49 ` [PATCH 07/18] nptl: Move __pthread_cleanup_upto into libc Florian Weimer
2021-03-16 14:35 ` Adhemerval Zanella [this message]
2021-03-12 17:49 ` [PATCH 08/18] nptl: Move pthread_once and __pthread_once " Florian Weimer
2021-03-15 19:24 ` Florian Weimer
2021-03-12 17:49 ` [PATCH 09/18] nptl: Move __pthread_unwind_next " Florian Weimer
2021-03-12 17:49 ` [PATCH 10/18] csu: Move calling main out of __libc_start_main_impl Florian Weimer
2021-03-12 17:49 ` [PATCH 11/18] nptl: Move internal __nptl_nthreads variable into libc Florian Weimer
2021-03-12 17:49 ` [PATCH 12/18] nptl_db: Introduce DB_MAIN_ARRAY_VARIABLE Florian Weimer
2021-03-12 17:50 ` [PATCH 13/18] nptl: Move __pthread_keys global variable into libc Florian Weimer
2021-03-12 17:50 ` [PATCH 14/18] nptl: Move __nptl_deallocate_tsd " Florian Weimer
2021-03-12 17:50 ` [PATCH 15/18] nptl: Move pthread_exit " Florian Weimer
2021-03-12 17:50 ` [PATCH 16/18] nptl: Move pthread_setcancelstate " Florian Weimer
2021-03-12 17:50 ` [PATCH 17/18] nptl: Move pthread_setcanceltype " Florian Weimer
2021-03-12 17:50 ` [PATCH 18/18] nptl: Invoke the set_robust_list system call directly in fork Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26399434-254d-6f15-894f-618f99f2858d@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).