[11/14] Remove non cancellable sigsuspend definition

Message ID 1501765874-6201-12-git-send-email-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • Untitled series #3168
Related show

Commit Message

Adhemerval Zanella Aug. 3, 2017, 1:11 p.m.
There is no current internal usage fo non cancellable sigsuspend calls.

Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.

	* sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove
	macro.
	* sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel):
	Likewise.
---
 ChangeLog                            | 5 +++++
 sysdeps/generic/not-cancel.h         | 2 --
 sysdeps/mach/hurd/sigsuspend.c       | 1 -
 sysdeps/unix/sysv/linux/not-cancel.h | 4 ----
 4 files changed, 5 insertions(+), 7 deletions(-)

-- 
2.7.4

Comments

Adhemerval Zanella Aug. 22, 2017, 1:07 p.m. | #1
Since this is a refactor, if no one opposes I will commit it shortly.

On 03/08/2017 10:11, Adhemerval Zanella wrote:
> There is no current internal usage fo non cancellable sigsuspend calls.

> 

> Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.

> 

> 	* sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove

> 	macro.

> 	* sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel):

> 	Likewise.

> ---

>  ChangeLog                            | 5 +++++

>  sysdeps/generic/not-cancel.h         | 2 --

>  sysdeps/mach/hurd/sigsuspend.c       | 1 -

>  sysdeps/unix/sysv/linux/not-cancel.h | 4 ----

>  4 files changed, 5 insertions(+), 7 deletions(-)

> 

> diff --git a/ChangeLog b/ChangeLog

> index bf9bd57..9ed9789 100644

> --- a/ChangeLog

> +++ b/ChangeLog

> @@ -1,5 +1,10 @@

>  2017-08-02  Adhemerval Zanella  <adhemerval.zanella@linaro.org>

>  

> +	* sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove

> +	macro.

> +	* sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel):

> +	Likewise.

> +

>  	* nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock): Replace

>  	nanosleep_not_cancel with __nanosleep_nocancel.

>  	* sysdeps/generic/not-cancel.h (nanosleep_not_cancel): Remove macro.

> diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h

> index e4a8584..70ead55 100644

> --- a/sysdeps/generic/not-cancel.h

> +++ b/sysdeps/generic/not-cancel.h

> @@ -42,7 +42,5 @@

>    __pause ()

>  #define __nanosleep_nocancel(requested_time, remaining) \

>    __nanosleep (requested_time, remaining)

> -#define sigsuspend_not_cancel(set) \

> -  __sigsuspend (set)

>  

>  #define NO_CANCELLATION 1

> diff --git a/sysdeps/mach/hurd/sigsuspend.c b/sysdeps/mach/hurd/sigsuspend.c

> index 4f5af1d..e60f2eb 100644

> --- a/sysdeps/mach/hurd/sigsuspend.c

> +++ b/sysdeps/mach/hurd/sigsuspend.c

> @@ -79,5 +79,4 @@ __sigsuspend (const sigset_t *set)

>    return -1;

>  }

>  libc_hidden_def (__sigsuspend)

> -strong_alias (__sigsuspend, sigsuspend_not_cancel)

>  weak_alias (__sigsuspend, sigsuspend)

> diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h

> index 07f07f6..8740d40 100644

> --- a/sysdeps/unix/sysv/linux/not-cancel.h

> +++ b/sysdeps/unix/sysv/linux/not-cancel.h

> @@ -86,8 +86,4 @@ libc_hidden_proto (__pause_nocancel)

>  __typeof (__nanosleep) __nanosleep_nocancel;

>  hidden_proto (__nanosleep_nocancel)

>  

> -/* Uncancelable sigsuspend.  */

> -#define sigsuspend_not_cancel(set) \

> -  INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8)

> -

>  #endif /* NOT_CANCEL_H  */

>

Patch

diff --git a/ChangeLog b/ChangeLog
index bf9bd57..9ed9789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@ 
 2017-08-02  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+	* sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove
+	macro.
+	* sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel):
+	Likewise.
+
 	* nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock): Replace
 	nanosleep_not_cancel with __nanosleep_nocancel.
 	* sysdeps/generic/not-cancel.h (nanosleep_not_cancel): Remove macro.
diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h
index e4a8584..70ead55 100644
--- a/sysdeps/generic/not-cancel.h
+++ b/sysdeps/generic/not-cancel.h
@@ -42,7 +42,5 @@ 
   __pause ()
 #define __nanosleep_nocancel(requested_time, remaining) \
   __nanosleep (requested_time, remaining)
-#define sigsuspend_not_cancel(set) \
-  __sigsuspend (set)
 
 #define NO_CANCELLATION 1
diff --git a/sysdeps/mach/hurd/sigsuspend.c b/sysdeps/mach/hurd/sigsuspend.c
index 4f5af1d..e60f2eb 100644
--- a/sysdeps/mach/hurd/sigsuspend.c
+++ b/sysdeps/mach/hurd/sigsuspend.c
@@ -79,5 +79,4 @@  __sigsuspend (const sigset_t *set)
   return -1;
 }
 libc_hidden_def (__sigsuspend)
-strong_alias (__sigsuspend, sigsuspend_not_cancel)
 weak_alias (__sigsuspend, sigsuspend)
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index 07f07f6..8740d40 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -86,8 +86,4 @@  libc_hidden_proto (__pause_nocancel)
 __typeof (__nanosleep) __nanosleep_nocancel;
 hidden_proto (__nanosleep_nocancel)
 
-/* Uncancelable sigsuspend.  */
-#define sigsuspend_not_cancel(set) \
-  INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8)
-
 #endif /* NOT_CANCEL_H  */