mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
102dde842a
The NO_CANCELLATION macro is used currently on generic headers to define non cancellable syscalls and on Linux fcntl to implement the non cancellable variation. Former should be single-handled by not-cancel.h header and former could be simplified build both cancellable and non cancellable for default objects and alias the non-cancellable to default one for rtld ones (since Linux already support cancellation as default). This patch thus removes the NO_CANCELLATION macro and its usage. The generic non cancellable fcntl is route to internal fcntl. Checked on x86_64-linux-gnu and i686-linux-gnu. Also checked with a build again major ABIs. * sysdeps/generic/not-cancel.h (NO_CANCELLATION): Remove macro. * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (NO_CANCELLATION): Likewise * sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/tile/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/not-cancel.h (__fcntl_nocancel): Add hidden prototype. * sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Define only for !IS_IN (rtld) and remove NO_CANCELLATION usage.
47 lines
1.8 KiB
C
47 lines
1.8 KiB
C
/* Uncancelable versions of cancelable interfaces. Generic version.
|
|
Copyright (C) 2003-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* By default we have none. Map the name to the normal functions. */
|
|
#define __open_nocancel(...) \
|
|
__open (__VA_ARGS__)
|
|
#define __open64_nocancel(...) \
|
|
__open64 (__VA_ARGS__)
|
|
#define __openat_nocancel(...) \
|
|
__openat (__VA_ARGS__)
|
|
#define __openat64_nocancel(...) \
|
|
__openat64 (__VA_ARGS__)
|
|
#define __close_nocancel(fd) \
|
|
__close (fd)
|
|
#define __close_nocancel_nostatus(fd) \
|
|
(void) __close (fd)
|
|
#define __read_nocancel(fd, buf, n) \
|
|
__read (fd, buf, n)
|
|
#define __write_nocancel(fd, buf, n) \
|
|
__write (fd, buf, n)
|
|
#define __writev_nocancel_nostatus(fd, iov, n) \
|
|
(void) __writev (fd, iov, n)
|
|
# define __waitpid_nocancel(pid, stat_loc, options) \
|
|
__waitpid (pid, stat_loc, options)
|
|
#define __pause_nocancel() \
|
|
__pause ()
|
|
#define __nanosleep_nocancel(requested_time, remaining) \
|
|
__nanosleep (requested_time, remaining)
|
|
#define __fcntl_nocancel(fd, cmd, ...) \
|
|
__fcntl (fd, cmd, __VA_ARGS__)
|