[前][次][番号順一覧][スレッド一覧]

ruby-changes:47517

From: nobu <ko1@a...>
Date: Tue, 22 Aug 2017 11:42:27 +0900 (JST)
Subject: [ruby-changes:47517] nobu:r59633 (trunk): signal.c: removed raise_stack_overflow:

nobu	2017-08-22 11:42:23 +0900 (Tue, 22 Aug 2017)

  New Revision: 59633

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59633

  Log:
    signal.c: removed raise_stack_overflow:

  Modified files:
    trunk/signal.c
Index: signal.c
===================================================================
--- signal.c	(revision 59632)
+++ signal.c	(revision 59633)
@@ -774,14 +774,13 @@ NORETURN(void rb_threadptr_stack_overflo https://github.com/ruby/ruby/blob/trunk/signal.c#L774
 # elif defined __FreeBSD__
 #   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)
+reset_sigmask(int sig)
 {
 #if defined(ruby_sigunmask)
     sigset_t mask;
@@ -794,7 +793,6 @@ raise_stack_overflow(int sig, rb_thread_ https://github.com/ruby/ruby/blob/trunk/signal.c#L793
 	rb_bug_errno(STRINGIZE(ruby_sigunmask)":unblock", errno);
     }
 #endif
-    rb_threadptr_stack_overflow(th);
 }
 
 # ifdef USE_UCONTEXT_REG
@@ -851,7 +849,8 @@ check_stack_overflow(int sig, const uint https://github.com/ruby/ruby/blob/trunk/signal.c#L849
 	     * place. */
 	    th->ec.tag = th->ec.tag->prev;
 	}
-	raise_stack_overflow(sig, th);
+	reset_sigmask(sig);
+	rb_threadptr_stack_overflow(th);
     }
 }
 # else
@@ -861,7 +860,8 @@ check_stack_overflow(int sig, const void https://github.com/ruby/ruby/blob/trunk/signal.c#L860
     int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
     rb_thread_t *th = ruby_current_thread;
     if (ruby_stack_overflowed_p(th, addr)) {
-	raise_stack_overflow(sig, th);
+	reset_sigmask(sig);
+	rb_threadptr_stack_overflow(th);
     }
 }
 # endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]