Applied, thanks!
Sergey Bugaev, le mer. 17 mai 2023 22:14:31 +0300, a ecrit:
> ...instead of mach_setup_thread (), which is unsuitable for setting up
> function calls.
>
> Checked on x86_64-gnu: the signal thread no longer crashes upon trying
> to process a message.
>
> Signed-off-by: Sergey Bugaev <buga...@gmail.com>
> ---
> hurd/hurdsig.c | 10 ++++++----
> sysdeps/mach/hurd/profil.c | 5 +++--
> sysdeps/mach/hurd/setitimer.c | 11 ++++++-----
> 3 files changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
> index 78ea59d9..313e95ae 100644
> --- a/hurd/hurdsig.c
> +++ b/hurd/hurdsig.c
> @@ -22,6 +22,7 @@
> #include <lock-intern.h> /* For `struct mutex'. */
> #include <pthreadP.h>
> #include <mach.h>
> +#include <mach/setup-thread.h>
> #include <mach/thread_switch.h>
> #include <mach/mig_support.h>
> #include <mach/vm_param.h>
> @@ -1525,10 +1526,11 @@ _hurdsig_init (const int *intarray, size_t
> intarraysize)
> assert_perror (err);
>
> stacksize = __vm_page_size * 8; /* Small stack for signal thread. */
> - err = __mach_setup_thread (__mach_task_self (), _hurd_msgport_thread,
> - _hurd_msgport_receive,
> - (vm_address_t *) &__hurd_sigthread_stack_base,
> - &stacksize);
> + err = __mach_setup_thread_call (__mach_task_self (),
> + _hurd_msgport_thread,
> + _hurd_msgport_receive,
> + (vm_address_t *)
> &__hurd_sigthread_stack_base,
> + &stacksize);
> assert_perror (err);
> err = __mach_setup_tls (_hurd_msgport_thread);
> assert_perror (err);
> diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
> index 64fe76f7..8092df0a 100644
> --- a/sysdeps/mach/hurd/profil.c
> +++ b/sysdeps/mach/hurd/profil.c
> @@ -22,6 +22,7 @@
> #include <hurd.h>
> #include <mach/mach4.h>
> #include <mach/pc_sample.h>
> +#include <mach/setup-thread.h>
> #include <lock-intern.h>
> #include <assert.h>
> #include <libc-internal.h>
> @@ -68,8 +69,8 @@ update_waiter (u_short *sample_buffer, size_t size, size_t
> offset, u_int scale)
> /* Set up the profiling collector thread. */
> err = __thread_create (__mach_task_self (), &profile_thread);
> if (! err)
> - err = __mach_setup_thread (__mach_task_self (), profile_thread,
> - &profile_waiter, NULL, NULL);
> + err = __mach_setup_thread_call (__mach_task_self (), profile_thread,
> + &profile_waiter, NULL, NULL);
> if (! err)
> err = __mach_setup_tls(profile_thread);
> }
> diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c
> index d09c59dc..03191b91 100644
> --- a/sysdeps/mach/hurd/setitimer.c
> +++ b/sysdeps/mach/hurd/setitimer.c
> @@ -25,6 +25,7 @@
> #include <hurd/msg_request.h>
> #include <mach.h>
> #include <mach/message.h>
> +#include <mach/setup-thread.h>
>
> /* XXX Temporary cheezoid implementation of ITIMER_REAL/SIGALRM. */
>
> @@ -227,11 +228,11 @@ setitimer_locked (const struct itimerval *new, struct
> itimerval *old,
> goto out;
> _hurd_itimer_thread_stack_base = 0; /* Anywhere. */
> _hurd_itimer_thread_stack_size = __vm_page_size; /* Small stack. */
> - if ((err = __mach_setup_thread (__mach_task_self (),
> - _hurd_itimer_thread,
> - &timer_thread,
> - &_hurd_itimer_thread_stack_base,
> - &_hurd_itimer_thread_stack_size))
> + if ((err = __mach_setup_thread_call (__mach_task_self (),
> + _hurd_itimer_thread,
> + &timer_thread,
> + &_hurd_itimer_thread_stack_base,
> + &_hurd_itimer_thread_stack_size))
> || (err = __mach_setup_tls(_hurd_itimer_thread)))
> {
> __thread_terminate (_hurd_itimer_thread);
> --
> 2.40.1
>
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
