mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 17:40:06 +00:00
c22845744c
This patch consolidates all the non cancellable open calls to use the __open_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. To be consistent with the following non cancellable openat call, a new __open64_nocancel is also added (although not currently used). Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (open_not_cancel): Remove macro. (open_not_cancel_2): Likewise. (open_nocancel): New macro. (open64_nocancel): Likewise. * sysdeps/unix/sysv/linux/not-cancel.h (open_not_cancel): Remove macro. (open_not_cancel_2): Likewise. (__open_nocancel): New prototype. (__open64_nocancel): Likewise. * sysdeps/unix/sysv/linux/Versions (libc) [GLIBC_PRIVATE]: Add __open_nocancel. * sysdeps/unix/sysv/linux/open.c (__open_nocancel): New function. * sysdeps/unix/sysv/linux/open64.c (__open64_nocancel): Likewise. * catgets/open_catalog.c (__open_catalog): Replace open_not_cancel{_2} with __open_nocancel. * csu/check_fds.c (check_one_fd): Likewise. * gmon/gmon.c (write_gmon): Likewise. * iconv/gconv_cache.c (__gconv_load_cached): Likewise. * intl/loadmsgcat.c (open): Likewise. * libio/fileops.c (_IO_file_open): Likewise. * locale/loadarchive.c (_nl_load_locale_from_archive): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * login/utmp_file.c (setutent_file): Likewise. * misc/daemon.c (daemon): Likewise. * nss/nss_db/db-open.c (internal_setent): Likewise. * sysdeps/mach/hurd/opendir.c (__opendirat): Likewise. * sysdeps/posix/libc_fatal.c (__libc_message): Likewise. * sysdeps/posix/opendir.c (tryopen_o_directory): Likewise. (__opendir): Likewise. * sysdeps/posix/spawni.c (__spawni_child): Likewise. * sysdeps/unix/sysv/linux/fips-private.h (fips_enable_p): Likewise. * sysdeps/unix/sysv/linux/gethostid.c (sethostid): Likewise. (gethostid): Likewise. * sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise. * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Likewise. * sysdeps/unix/sysv/linux/grantpt.c (__close_all_fds): Likewise. * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise. * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock): Likewise. * sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps): Likewise. * sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap): Likewise. * sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c (__get_clockfreq): Likewise. * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np): Likewise. * sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np): Likewise. * sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise. * sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
106 lines
3.5 KiB
C
106 lines
3.5 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>
|
|
|
|
/* 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)
|
|
|
|
/* Uncancelable read. */
|
|
#define __read_nocancel(fd, buf, len) \
|
|
INLINE_SYSCALL (read, 3, fd, buf, len)
|
|
|
|
/* Uncancelable write. */
|
|
#define __write_nocancel(fd, buf, len) \
|
|
INLINE_SYSCALL (write, 3, fd, buf, len)
|
|
|
|
/* Uncancelable openat. */
|
|
#define openat_not_cancel(fd, fname, oflag, mode) \
|
|
INLINE_SYSCALL (openat, 4, fd, fname, oflag, mode)
|
|
#define openat_not_cancel_3(fd, fname, oflag) \
|
|
INLINE_SYSCALL (openat, 3, fd, fname, oflag)
|
|
#define openat64_not_cancel(fd, fname, oflag, mode) \
|
|
INLINE_SYSCALL (openat, 4, fd, fname, oflag | O_LARGEFILE, mode)
|
|
#define openat64_not_cancel_3(fd, fname, oflag) \
|
|
INLINE_SYSCALL (openat, 3, fd, fname, oflag | O_LARGEFILE)
|
|
|
|
/* Uncancelable close. */
|
|
#define __close_nocancel(fd) \
|
|
INLINE_SYSCALL (close, 1, fd)
|
|
#define close_not_cancel(fd) \
|
|
__close_nocancel (fd)
|
|
#define close_not_cancel_no_status(fd) \
|
|
(void) ({ INTERNAL_SYSCALL_DECL (err); \
|
|
INTERNAL_SYSCALL (close, err, 1, (fd)); })
|
|
|
|
/* Uncancelable read. */
|
|
#define read_not_cancel(fd, buf, n) \
|
|
__read_nocancel (fd, buf, n)
|
|
|
|
/* Uncancelable write. */
|
|
#define write_not_cancel(fd, buf, n) \
|
|
__write_nocancel (fd, buf, n)
|
|
|
|
/* Uncancelable writev. */
|
|
#define writev_not_cancel_no_status(fd, iov, n) \
|
|
(void) ({ INTERNAL_SYSCALL_DECL (err); \
|
|
INTERNAL_SYSCALL (writev, err, 3, (fd), (iov), (n)); })
|
|
|
|
/* Uncancelable fcntl. */
|
|
#define fcntl_not_cancel(fd, cmd, val) \
|
|
__fcntl_nocancel (fd, cmd, val)
|
|
|
|
/* Uncancelable waitpid. */
|
|
#define __waitpid_nocancel(pid, stat_loc, options) \
|
|
INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)
|
|
#define waitpid_not_cancel(pid, stat_loc, options) \
|
|
__waitpid_nocancel(pid, stat_loc, options)
|
|
|
|
/* Uncancelable pause. */
|
|
#define pause_not_cancel() \
|
|
({ sigset_t set; \
|
|
int __rc = INLINE_SYSCALL (rt_sigprocmask, 4, SIG_BLOCK, NULL, &set, \
|
|
_NSIG / 8); \
|
|
if (__rc == 0) \
|
|
__rc = INLINE_SYSCALL (rt_sigsuspend, 2, &set, _NSIG / 8); \
|
|
__rc; \
|
|
})
|
|
|
|
/* Uncancelable nanosleep. */
|
|
#define nanosleep_not_cancel(requested_time, remaining) \
|
|
INLINE_SYSCALL (nanosleep, 2, requested_time, remaining)
|
|
|
|
/* Uncancelable sigsuspend. */
|
|
#define sigsuspend_not_cancel(set) \
|
|
INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8)
|
|
|
|
#endif /* NOT_CANCEL_H */
|