From 6f1fbfd6187db01e3c3967468cc8b182fc8ca847 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 15 Apr 2017 02:07:01 +0000
Subject: signal.c: prefer pthread_sigmask

* signal.c (raise_stack_overflow): prefer pthread_sigmask to
  sigprocmask, for multithreading.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 signal.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'signal.c')

diff --git a/signal.c b/signal.c
index db1403fddd..2c37928256 100644
--- a/signal.c
+++ b/signal.c
@@ -773,18 +773,24 @@ NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
 #   define USE_UCONTEXT_REG 1
 # endif
 NORETURN(static void raise_stack_overflow(int sig, rb_thread_t *th));
+#if defined(HAVE_PTHREAD_SIGMASK)
+# define ruby_sigunmask pthread_sigmask
+#elif defined(HAVE_SIGPROCMASK)
+# define ruby_sigunmask sigprocmask
+#endif
 static void
 raise_stack_overflow(int sig, rb_thread_t *th)
 {
-#ifdef HAVE_SIGPROCMASK
+#if defined(ruby_sigunmask)
     sigset_t mask;
 #endif
     clear_received_signal();
-#ifdef HAVE_SIGPROCMASK
+#if defined(ruby_sigunmask)
     sigemptyset(&mask);
     sigaddset(&mask, sig);
-    if (sigprocmask(SIG_UNBLOCK, &mask, NULL))
-	rb_bug_errno("sigprocmask:set", errno);
+    if (ruby_sigunmask(SIG_UNBLOCK, &mask, NULL)) {
+	rb_bug_errno(STRINGIZE(ruby_sigunmask)":unblock", errno);
+    }
 #endif
     ruby_thread_stack_overflow(th);
 }
-- 
cgit v1.2.3