public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Remove pause and nanosleep not cancel wrappers
@ 2019-10-31 14:12 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2019-10-31 14:12 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fbb4a3143724ef3f044a4f05351fe041300ee382
commit fbb4a3143724ef3f044a4f05351fe041300ee382
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Oct 30 14:04:08 2019 -0300
Remove pause and nanosleep not cancel wrappers
Since they are not used any longer.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diff:
---
sysdeps/generic/not-cancel.h | 4 ----
sysdeps/unix/sysv/linux/Makefile | 4 ++--
sysdeps/unix/sysv/linux/nanosleep_nocancel.c | 29 ------------------------
sysdeps/unix/sysv/linux/not-cancel.h | 8 -------
sysdeps/unix/sysv/linux/pause_nocancel.c | 33 ----------------------------
5 files changed, 2 insertions(+), 76 deletions(-)
diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h
index 5df48f3..d3b53e4 100644
--- a/sysdeps/generic/not-cancel.h
+++ b/sysdeps/generic/not-cancel.h
@@ -49,10 +49,6 @@
(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 __fcntl64_nocancel(fd, cmd, ...) \
__fcntl64 (fd, cmd, __VA_ARGS__)
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index a7623fb..07776d2 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -212,10 +212,10 @@ endif
ifeq ($(subdir),io)
sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
sync_file_range fallocate fallocate64 \
- close_nocancel fcntl_nocancel nanosleep_nocancel \
+ close_nocancel fcntl_nocancel \
open_nocancel open64_nocancel \
openat_nocancel openat64_nocancel \
- pause_nocancel read_nocancel pread64_nocancel \
+ read_nocancel pread64_nocancel \
waitpid_nocancel write_nocancel statx_cp
sysdep_headers += bits/fcntl-linux.h
diff --git a/sysdeps/unix/sysv/linux/nanosleep_nocancel.c b/sysdeps/unix/sysv/linux/nanosleep_nocancel.c
deleted file mode 100644
index d6442bf..0000000
--- a/sysdeps/unix/sysv/linux/nanosleep_nocancel.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Linux nanosleep syscall implementation -- non-cancellable.
- Copyright (C) 2018-2019 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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
- <https://www.gnu.org/licenses/>. */
-
-#include <time.h>
-#include <sysdep-cancel.h>
-#include <not-cancel.h>
-
-int
-__nanosleep_nocancel (const struct timespec *requested_time,
- struct timespec *remaining)
-{
- return INLINE_SYSCALL_CALL (nanosleep, requested_time, remaining);
-}
-hidden_def (__nanosleep_nocancel)
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index 041fd00..192a0a5 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -72,12 +72,6 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt)
/* Uncancelable waitpid. */
__typeof (waitpid) __waitpid_nocancel;
-/* Uncancelable pause. */
-__typeof (pause) __pause_nocancel;
-
-/* Uncancelable nanosleep. */
-__typeof (__nanosleep) __nanosleep_nocancel;
-
/* Uncancelable fcntl. */
__typeof (__fcntl) __fcntl64_nocancel;
@@ -91,8 +85,6 @@ hidden_proto (__pread64_nocancel)
hidden_proto (__write_nocancel)
hidden_proto (__close_nocancel)
hidden_proto (__waitpid_nocancel)
-hidden_proto (__pause_nocancel)
-hidden_proto (__nanosleep_nocancel)
hidden_proto (__fcntl64_nocancel)
#endif
diff --git a/sysdeps/unix/sysv/linux/pause_nocancel.c b/sysdeps/unix/sysv/linux/pause_nocancel.c
deleted file mode 100644
index 04f6fcf..0000000
--- a/sysdeps/unix/sysv/linux/pause_nocancel.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Linux pause syscall implementation -- non-cancellable.
- Copyright (C) 2018-2019 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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
- <https://www.gnu.org/licenses/>. */
-
-#include <signal.h>
-#include <unistd.h>
-#include <sysdep-cancel.h>
-#include <not-cancel.h>
-
-int
-__pause_nocancel (void)
-{
-#ifdef __NR_pause
- return INLINE_SYSCALL_CALL (pause);
-#else
- return INLINE_SYSCALL_CALL (ppoll, NULL, 0, NULL, NULL);
-#endif
-}
-hidden_def (__pause_nocancel)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-10-31 14:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-31 14:12 [glibc] Remove pause and nanosleep not cancel wrappers Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).