mirror of
https://sourceware.org/git/glibc.git
synced 2025-11-03 20:53:13 +03: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.
93 lines
2.7 KiB
C
93 lines
2.7 KiB
C
/* Uncancelable versions of cancelable interfaces. Linux/NPTL 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/>. */
|
|
|
|
#ifndef NOT_CANCEL_H
|
|
# define NOT_CANCEL_H
|
|
|
|
#include <fcntl.h>
|
|
#include <sysdep.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <sys/syscall.h>
|
|
#include <sys/wait.h>
|
|
#include <time.h>
|
|
|
|
/* Non cancellable open syscall. */
|
|
__typeof (open) __open_nocancel;
|
|
libc_hidden_proto (__open_nocancel)
|
|
|
|
/* Non cancellable open syscall (LFS version). */
|
|
__typeof (open64) __open64_nocancel;
|
|
libc_hidden_proto (__open64_nocancel)
|
|
|
|
/* Non cancellable openat syscall. */
|
|
__typeof (openat) __openat_nocancel;
|
|
libc_hidden_proto (__openat_nocancel)
|
|
|
|
/* Non cacellable openat syscall (LFS version). */
|
|
__typeof (openat64) __openat64_nocancel;
|
|
libc_hidden_proto (__openat64_nocancel)
|
|
|
|
/* Non cancellable read syscall. */
|
|
__typeof (__read) __read_nocancel;
|
|
libc_hidden_proto (__read_nocancel)
|
|
|
|
/* Uncancelable write. */
|
|
__typeof (__write) __write_nocancel;
|
|
libc_hidden_proto (__write_nocancel)
|
|
|
|
/* Uncancelable close. */
|
|
__typeof (__close) __close_nocancel;
|
|
libc_hidden_proto (__close_nocancel)
|
|
|
|
/* Non cancellable close syscall that does not also set errno in case of
|
|
failure. */
|
|
static inline void
|
|
__close_nocancel_nostatus (int fd)
|
|
{
|
|
__close_nocancel (fd);
|
|
}
|
|
|
|
/* Non cancellable writev syscall that does not also set errno in case of
|
|
failure. */
|
|
static inline void
|
|
__writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt)
|
|
{
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
INTERNAL_SYSCALL_CALL (writev, err, fd, iov, iovcnt);
|
|
}
|
|
|
|
/* Uncancelable waitpid. */
|
|
__typeof (waitpid) __waitpid_nocancel;
|
|
libc_hidden_proto (__waitpid_nocancel)
|
|
|
|
/* Uncancelable pause. */
|
|
__typeof (pause) __pause_nocancel;
|
|
libc_hidden_proto (__pause_nocancel)
|
|
|
|
/* Uncancelable nanosleep. */
|
|
__typeof (__nanosleep) __nanosleep_nocancel;
|
|
hidden_proto (__nanosleep_nocancel)
|
|
|
|
/* Uncancelable fcntl. */
|
|
__typeof (__fcntl) __fcntl_nocancel;
|
|
libc_hidden_proto (__fcntl_nocancel)
|
|
|
|
#endif /* NOT_CANCEL_H */
|