kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

refactoring (rb_|)threadptr_stack_overflow.

Browse source 
* vm_insnhelper.c (ec_stack_overflow): renamed from threadptr_stack_overflow
  and also rb_ec_stack_overflow is from rb_threadptr_stack_overflow
  because they accept `ec` instead of `th`.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-10-27 01:13:35 +00:00
parent e47a687c83
commit 9d41e74398
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
signal.c
View file

@ -759,7 +759,7 @@ static const char *received_signal;
#endif
#if defined(USE_SIGALTSTACK) || defined(_WIN32)
NORETURN(void rb_threadptr_stack_overflow(rb_thread_t *th, int crit));
NORETURN(void rb_ec_stack_overflow(rb_execution_context_t *ec, int crit));
# if defined __HAIKU__
# define USE_UCONTEXT_REG 1
# elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__))
@ -838,17 +838,17 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx)
* the fault page can be the next. */
if (sp_page == fault_page || sp_page == fault_page + 1 ||
sp_page <= fault_page && fault_page <= bp_page) {
rb_thread_t *th = ruby_current_thread();
rb_execution_context_t *ec = GET_EC();
int crit = FALSE;
if ((uintptr_t)th->ec->tag->buf / pagesize <= fault_page + 1) {
if ((uintptr_t)ec->tag->buf / pagesize <= fault_page + 1) {
/* drop the last tag if it is close to the fault,
* otherwise it can cause stack overflow again at the same
* place. */
th->ec->tag = th->ec->tag->prev;
ec->tag = ec->tag->prev;
crit = TRUE;
}
reset_sigmask(sig);
rb_threadptr_stack_overflow(th, crit);
rb_ec_stack_overflow(ec, crit);
}
}
# else
@ -856,10 +856,10 @@ static void
check_stack_overflow(int sig, const void *addr)
{
int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
rb_thread_t *th = GET_THREAD();
if (ruby_stack_overflowed_p(th, addr)) {
rb_execution_context_t *ec = GET_EC();
if (ruby_stack_overflowed_p(ec, addr)) {
reset_sigmask(sig);
rb_threadptr_stack_overflow(th, FALSE);
rb_ec_stack_overflow(ec, FALSE);
}
}
# endif

2
vm_eval.c
View file

@ -258,7 +258,7 @@ stack_check(rb_thread_t *th)
if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) &&
rb_threadptr_stack_check(th)) {
rb_thread_raised_set(th, RAISED_STACKOVERFLOW);
rb_threadptr_stack_overflow(th, FALSE);
rb_ec_stack_overflow(th->ec, FALSE);
}
}

30
vm_insnhelper.c
View file

@ -30,41 +30,41 @@ ruby_vm_special_exception_copy(VALUE exc)
return e;
}
NORETURN(static void threadptr_stack_overflow(rb_thread_t *, int));
NORETURN(static void ec_stack_overflow(rb_execution_context_t *ec, int));
static void
threadptr_stack_overflow(rb_thread_t *th, int setup)
ec_stack_overflow(rb_execution_context_t *ec, int setup)
{
VALUE mesg = th->vm->special_exceptions[ruby_error_sysstack];
th->ec->raised_flag = RAISED_STACKOVERFLOW;
VALUE mesg = rb_ec_vm_ptr(ec)->special_exceptions[ruby_error_sysstack];
ec->raised_flag = RAISED_STACKOVERFLOW;
if (setup) {
VALUE at = rb_threadptr_backtrace_object(th);
VALUE at = rb_threadptr_backtrace_object(rb_ec_thread_ptr(ec));
mesg = ruby_vm_special_exception_copy(mesg);
rb_ivar_set(mesg, idBt, at);
rb_ivar_set(mesg, idBt_locations, at);
}
th->ec->errinfo = mesg;
EC_JUMP_TAG(th->ec, TAG_RAISE);
ec->errinfo = mesg;
EC_JUMP_TAG(ec, TAG_RAISE);
}
static void
vm_stackoverflow(void)
{
threadptr_stack_overflow(GET_THREAD(), TRUE);
ec_stack_overflow(GET_EC(), TRUE);
}
NORETURN(void rb_threadptr_stack_overflow(rb_thread_t *th, int crit));
NORETURN(void rb_ec_stack_overflow(rb_execution_context_t *ec, int crit));
void
rb_threadptr_stack_overflow(rb_thread_t *th, int crit)
rb_ec_stack_overflow(rb_execution_context_t *ec, int crit)
{
if (crit || rb_during_gc()) {
th->ec->raised_flag = RAISED_STACKOVERFLOW;
th->ec->errinfo = th->vm->special_exceptions[ruby_error_stackfatal];
EC_JUMP_TAG(th->ec, TAG_RAISE);
ec->raised_flag = RAISED_STACKOVERFLOW;
ec->errinfo = rb_ec_vm_ptr(ec)->special_exceptions[ruby_error_stackfatal];
EC_JUMP_TAG(ec, TAG_RAISE);
}
#ifdef USE_SIGALTSTACK
threadptr_stack_overflow(th, TRUE);
ec_stack_overflow(ec, TRUE);
#else
threadptr_stack_overflow(th, FALSE);
ec_stack_overflow(ec, FALSE);
#endif
}