public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 01/13] posix: Consolidate Linux pause syscall
@ 2017-05-12 17:58 Adhemerval Zanella
  2017-05-12 17:58 ` [PATCH 04/13] linux: Consolidate Linux tee implementation Adhemerval Zanella
                   ` (12 more replies)
  0 siblings, 13 replies; 36+ messages in thread
From: Adhemerval Zanella @ 2017-05-12 17:58 UTC (permalink / raw)
  To: libc-alpha

This patch consolidates the pause Linux implementation on
sysdeps/unix/sysv/linux/pause.c.  If defined the pause syscall
(__NR_pause) will be used, other ppoll with 0 arguments will be
used instead.

It has the small advantage of generic pause implementation with
uses rt_sigprocmask plus rt_sigsuspend because it requires only
one syscall and the pause is done atomically regarding signal
handling (for instance, pause may not be interrupted if the
signal arrives between the rt_sigprocmask and rt_sigsuspend
syscall).

Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
arch64-linux-gnu, arm-linux-gnueabihf, powerpc64le-linux-gnu,
sparc64-linux-gnu, and sparcv9-linux-gnu.

	* sysdeps/unix/sysv/linux/generic/pause.c: Remove file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/pause.c: Likewise.
	* sysdeps/unix/sysv/linux/sparc/kernel-features.h [__arch64__]
	(__NR_pause): Undefine.
	* sysdeps/unix/sysv/linux/pause.c: New file.
	* sysdeps/unix/sysv/linux/syscalls.list: Remove pause from
	auto-generation list.
---
 ChangeLog                                       | 10 ++++++++++
 sysdeps/unix/sysv/linux/{generic => }/pause.c   | 18 +++++++-----------
 sysdeps/unix/sysv/linux/sparc/kernel-features.h |  6 ++++++
 sysdeps/unix/sysv/linux/sparc/sparc64/pause.c   |  9 ---------
 sysdeps/unix/sysv/linux/syscalls.list           |  1 -
 5 files changed, 23 insertions(+), 21 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/pause.c (75%)
 delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/pause.c

diff --git a/sysdeps/unix/sysv/linux/generic/pause.c b/sysdeps/unix/sysv/linux/pause.c
similarity index 75%
rename from sysdeps/unix/sysv/linux/generic/pause.c
rename to sysdeps/unix/sysv/linux/pause.c
index a8b3e33..c6b252a 100644
--- a/sysdeps/unix/sysv/linux/generic/pause.c
+++ b/sysdeps/unix/sysv/linux/pause.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
+/* Linux pause syscall implementation.
+   Copyright (C) 2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -26,14 +26,10 @@
 int
 __libc_pause (void)
 {
-  sigset_t set;
-
-  int rc =
-    SYSCALL_CANCEL (rt_sigprocmask, SIG_BLOCK, NULL, &set, _NSIG / 8);
-  if (rc == 0)
-    rc = SYSCALL_CANCEL (rt_sigsuspend, &set, _NSIG / 8);
-
-  return rc;
+#ifdef __NR_pause
+  return SYSCALL_CANCEL (pause);
+#else
+  return SYSCALL_CANCEL (ppoll, 0, 0, 0, 0, 0);
+#endif
 }
-
 weak_alias (__libc_pause, pause)
diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
index 72065a0..dd9108b 100644
--- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
@@ -32,6 +32,12 @@
 # undef __ASSUME_ACCEPT_SYSCALL
 # undef __ASSUME_CONNECT_SYSCALL
 # undef __ASSUME_RECVFROM_SYSCALL
+#else
+/* sparc64 defines __NR_pause,  however it is not supported (ENOSYS).
+   Undefine so pause.c can use a correct alternative.  */
+# ifdef __NR_pause
+#  undef __NR_pause
+# endif
 #endif
 
 /* sparc only supports ipc syscall.  */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c b/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c
deleted file mode 100644
index e399e7c..0000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sysdep-cancel.h>
-
-#define __sigprocmask(how, set, oset) \
-  INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8)
-
-#include <sysdeps/posix/pause.c>
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index f4abf3e..eab30dd 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -44,7 +44,6 @@ munlock		-	munlock		i:ai	munlock
 munlockall	-	munlockall	i:	munlockall
 nanosleep	-	nanosleep	Ci:pp	__nanosleep	nanosleep
 nfsservctl	EXTRA	nfsservctl	i:ipp	nfsservctl
-pause		-	pause		Ci:	__libc_pause	pause
 pipe		-	pipe		i:f	__pipe		pipe
 pipe2		-	pipe2		i:fi	__pipe2		pipe2
 pivot_root	EXTRA	pivot_root	i:ss	pivot_root
-- 
2.7.4

^ permalink raw reply	[flat|nested] 36+ messages in thread
end of thread, other threads:[~2017-05-19 12:41 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-12 17:58 [PATCH 01/13] posix: Consolidate Linux pause syscall Adhemerval Zanella
2017-05-12 17:58 ` [PATCH 04/13] linux: Consolidate Linux tee implementation Adhemerval Zanella
2017-05-15 10:51   ` Florian Weimer
2017-05-15 11:41     ` Joseph Myers
2017-05-15 11:42       ` Florian Weimer
2017-05-12 17:58 ` [PATCH 02/13] posix: Consolidate Linux waitpid syscall Adhemerval Zanella
2017-05-18 19:10   ` Siddhesh Poyarekar
2017-05-12 17:58 ` [PATCH 08/13] posix: Consolidate Linux fsync syscall Adhemerval Zanella
2017-05-18 19:20   ` Siddhesh Poyarekar
2017-05-12 17:58 ` [PATCH 03/13] posix: Consolidate Linux nanosleep syscall Adhemerval Zanella
2017-05-12 18:21   ` Florian Weimer
2017-05-12 18:30     ` Adhemerval Zanella
2017-05-15  9:43       ` Stack unwinding requirements (was: Re: [PATCH 03/13] posix: Consolidate Linux nanosleep syscall) Florian Weimer
2017-05-15 11:37         ` Joseph Myers
2017-05-15 11:46           ` Stack unwinding requirements Florian Weimer
2017-05-12 17:58 ` [PATCH 06/13] posix: Consolidate Linux msync syscall Adhemerval Zanella
2017-05-18 19:18   ` Siddhesh Poyarekar
2017-05-12 17:58 ` [PATCH 09/13] linux: Consolidate Linux vmsplice syscall Adhemerval Zanella
2017-05-18 19:21   ` Siddhesh Poyarekar
2017-05-19 11:24   ` Joseph Myers
2017-05-19 12:41     ` Adhemerval Zanella
2017-05-12 17:58 ` [PATCH 11/13] linux: Consolidate Linux open_by_handle_at syscall Adhemerval Zanella
2017-05-18 19:23   ` Siddhesh Poyarekar
2017-05-18 19:43     ` Adhemerval Zanella
2017-05-12 17:58 ` [PATCH 07/13] posix: Consolidate Linux fdatasync syscall Adhemerval Zanella
2017-05-18 19:18   ` Siddhesh Poyarekar
2017-05-12 17:58 ` [PATCH 12/13] posix: Consolidate Linux mq_timedreceive syscall Adhemerval Zanella
2017-05-18 19:24   ` Siddhesh Poyarekar
2017-05-12 17:58 ` [PATCH 10/13] linux: Consolidate Linux splice syscall Adhemerval Zanella
2017-05-18 19:22   ` Siddhesh Poyarekar
2017-05-12 17:58 ` [PATCH 13/13] posix: Consolidate Linux mq_timedsend syscall Adhemerval Zanella
2017-05-18 19:25   ` Siddhesh Poyarekar
2017-05-12 17:58 ` [PATCH 05/13] posix: Consolidate Linux sigsuspend implementation Adhemerval Zanella
2017-05-18 19:16   ` Siddhesh Poyarekar
2017-05-12 18:15 ` [PATCH 01/13] posix: Consolidate Linux pause syscall Florian Weimer
2017-05-12 18:41   ` 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).