From 52b6cdb4e32dc9a32a81c68974f34db04db47c82 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 9 Feb 2020 19:43:43 +0000 Subject: htl: support cancellation during pthread_once --- sysdeps/htl/pt-once.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'sysdeps/htl') diff --git a/sysdeps/htl/pt-once.c b/sysdeps/htl/pt-once.c index 0581f7bd6c..7f86e28006 100644 --- a/sysdeps/htl/pt-once.c +++ b/sysdeps/htl/pt-once.c @@ -21,6 +21,13 @@ #include +static void +clear_once_control (void *arg) +{ + pthread_once_t *once_control = arg; + __pthread_spin_unlock (&once_control->__lock); +} + int __pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) { @@ -33,7 +40,10 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) if (once_control->__run == 0) { + pthread_cleanup_push (clear_once_control, once_control); init_routine (); + pthread_cleanup_pop (0); + atomic_full_barrier (); once_control->__run = 1; } -- cgit 1.4.1