mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
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.
This commit is contained in:
@ -19,10 +19,10 @@
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <sysdep-cancel.h>
|
||||
#include <not-cancel.h>
|
||||
|
||||
/* Suspend the process until a signal arrives.
|
||||
This always returns -1 and sets errno to EINTR. */
|
||||
|
||||
int
|
||||
__libc_pause (void)
|
||||
{
|
||||
@ -33,3 +33,14 @@ __libc_pause (void)
|
||||
#endif
|
||||
}
|
||||
weak_alias (__libc_pause, pause)
|
||||
|
||||
int
|
||||
__pause_nocancel (void)
|
||||
{
|
||||
#ifdef __NR_pause
|
||||
return INLINE_SYSCALL_CALL (pause);
|
||||
#else
|
||||
return INLINE_SYSCALL_CALL (ppoll, NULL, 0, NULL, NULL);
|
||||
#endif
|
||||
}
|
||||
libc_hidden_def (__pause_nocancel)
|
||||
|
Reference in New Issue
Block a user