From 08d6eb46caf13f46ce052d2be34522068c5a6d33 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 21 Aug 2017 17:23:56 -0300 Subject: Consolidate non cancellable pause call This patch consolidates all the non cancellable pause calls to use the __pause_nocancel identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * nptl/pthread_mutex_lock.c (__pthread_mutex_lock_full): Replace pause_not_cancel with __pause_nocancel. * sysdeps/generic/not-cancel.h (pause_not_cancel): Remove macro. (__pause_nocancel): New macro. * sysdeps/unix/sysv/linux/not-cancel.h (pause_not_cancel): Remove macro. (__pause_nocancel): New prototype. * sysdeps/unix/sysv/linux/pause.c (__pause_nocancel): New function. --- sysdeps/posix/pause.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'sysdeps/posix') diff --git a/sysdeps/posix/pause.c b/sysdeps/posix/pause.c index 7996cd6dbb..53e143d98f 100644 --- a/sysdeps/posix/pause.c +++ b/sysdeps/posix/pause.c @@ -39,18 +39,3 @@ __libc_pause (void) weak_alias (__libc_pause, pause) LIBC_CANCEL_HANDLED (); /* sigsuspend handles our cancellation. */ - -#ifndef NO_CANCELLATION -# include - -int -__pause_nocancel (void) -{ - sigset_t set; - - __sigemptyset (&set); - __sigprocmask (SIG_BLOCK, NULL, &set); - - return sigsuspend_not_cancel (&set); -} -#endif -- cgit v1.2.3-70-g09d2