1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

th->ec: rb_threadptr_reset_raised()

Browse Source 
* thread.c (rb_threadptr_reset_raised): rename to `rb_ec_reset_raised`
  and accepts `ec`.

* vm_trace.c: the following functions accept `ec` instead of `th`
  * exec_hooks_body
  * exec_hooks_precheck
  * exec_hooks_unprotected
  * exec_hooks_protected


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-11-07 04:01:13 +00:00
parent aa07918c3a
commit b6ecdf5fc8
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eval.c
View File

@ -524,7 +524,7 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
rb_ivar_set(mesg, idBt_locations, at); rb_ivar_set(mesg, idBt_locations, at);
set_backtrace(mesg, at); set_backtrace(mesg, at);
} }
rb_threadptr_reset_raised(rb_ec_thread_ptr(ec)); rb_ec_reset_raised(ec);
} }
EC_POP_TAG(); EC_POP_TAG();
if (state) goto fatal; if (state) goto fatal;
@ -563,7 +563,7 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
ec->errinfo = mesg; ec->errinfo = mesg;
} }
else if (state) { else if (state) {
rb_threadptr_reset_raised(rb_ec_thread_ptr(ec)); rb_ec_reset_raised(ec);
EC_JUMP_TAG(ec, state); EC_JUMP_TAG(ec, state);
} }
} }
@ -571,7 +571,7 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
if (rb_threadptr_set_raised(rb_ec_thread_ptr(ec))) { if (rb_threadptr_set_raised(rb_ec_thread_ptr(ec))) {
fatal: fatal:
ec->errinfo = exception_error; ec->errinfo = exception_error;
rb_threadptr_reset_raised(rb_ec_thread_ptr(ec)); rb_ec_reset_raised(ec);
EC_JUMP_TAG(ec, TAG_FATAL); EC_JUMP_TAG(ec, TAG_FATAL);
} }

2
eval_error.c
View File

@ -324,6 +324,6 @@ error_handle(int ex)
unknown_longjmp_status(ex); unknown_longjmp_status(ex);
break; break;
} }
rb_threadptr_reset_raised(rb_ec_thread_ptr(ec)); rb_ec_reset_raised(ec);
return status; return status;
} }

2
eval_intern.h
View File

@ -281,11 +281,11 @@ enum {
RAISED_NOMEMORY = 4 RAISED_NOMEMORY = 4
}; };
int rb_threadptr_set_raised(rb_thread_t *th); int rb_threadptr_set_raised(rb_thread_t *th);
int rb_threadptr_reset_raised(rb_thread_t *th);
#define rb_thread_raised_set(th, f) ((th)->ec->raised_flag |= (f)) #define rb_thread_raised_set(th, f) ((th)->ec->raised_flag |= (f))
#define rb_thread_raised_reset(th, f) ((th)->ec->raised_flag &= ~(f)) #define rb_thread_raised_reset(th, f) ((th)->ec->raised_flag &= ~(f))
#define rb_thread_raised_p(th, f) (((th)->ec->raised_flag & (f)) != 0) #define rb_thread_raised_p(th, f) (((th)->ec->raised_flag & (f)) != 0)
#define rb_thread_raised_clear(th) ((th)->ec->raised_flag = 0) #define rb_thread_raised_clear(th) ((th)->ec->raised_flag = 0)
int rb_ec_reset_raised(rb_execution_context_t *th);
int rb_ec_stack_check(rb_execution_context_t *ec); int rb_ec_stack_check(rb_execution_context_t *ec);
VALUE rb_f_eval(int argc, const VALUE *argv, VALUE self); VALUE rb_f_eval(int argc, const VALUE *argv, VALUE self);

6
thread.c
View File

@ -2177,12 +2177,12 @@ rb_threadptr_set_raised(rb_thread_t *th)
} }
int int
rb_threadptr_reset_raised(rb_thread_t *th) rb_ec_reset_raised(rb_execution_context_t *ec)
{ {
if (!(th->ec->raised_flag & RAISED_EXCEPTION)) { if (!(ec->raised_flag & RAISED_EXCEPTION)) {
return 0; return 0;
} }
th->ec->raised_flag &= ~RAISED_EXCEPTION; ec->raised_flag &= ~RAISED_EXCEPTION;
return 1; return 1;
} }

56
vm_trace.c
View File

@ -238,7 +238,7 @@ clean_hooks(rb_hook_list_t *list)
} }
static void static void
exec_hooks_body(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg) exec_hooks_body(const rb_execution_context_t *ec, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg)
{ {
rb_event_hook_t *hook; rb_event_hook_t *hook;
@ -255,10 +255,10 @@ exec_hooks_body(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *tra
} }
static int static int
exec_hooks_precheck(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg) exec_hooks_precheck(const rb_execution_context_t *ec, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg)
{ {
if (UNLIKELY(list->need_clean != FALSE)) { if (UNLIKELY(list->need_clean != FALSE)) {
if (th->vm->trace_running <= 1) { /* only running this hooks */ if (rb_ec_vm_ptr(ec)->trace_running <= 1) { /* only running this hooks */
clean_hooks(list); clean_hooks(list);
} }
} }
@ -267,32 +267,32 @@ exec_hooks_precheck(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t
} }
static void static void
exec_hooks_unprotected(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg) exec_hooks_unprotected(const rb_execution_context_t *ec, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg)
{ {
if (exec_hooks_precheck(th, list, trace_arg) == 0) return; if (exec_hooks_precheck(ec, list, trace_arg) == 0) return;
exec_hooks_body(th, list, trace_arg); exec_hooks_body(ec, list, trace_arg);
} }
static int static int
exec_hooks_protected(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg) exec_hooks_protected(rb_execution_context_t *ec, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg)
{ {
enum ruby_tag_type state; enum ruby_tag_type state;
volatile int raised; volatile int raised;
if (exec_hooks_precheck(th, list, trace_arg) == 0) return 0; if (exec_hooks_precheck(ec, list, trace_arg) == 0) return 0;
raised = rb_threadptr_reset_raised(th); raised = rb_ec_reset_raised(ec);
/* TODO: Support !RUBY_EVENT_HOOK_FLAG_SAFE hooks */ /* TODO: Support !RUBY_EVENT_HOOK_FLAG_SAFE hooks */
EC_PUSH_TAG(th->ec); EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) { if ((state = EC_EXEC_TAG()) == TAG_NONE) {
exec_hooks_body(th, list, trace_arg); exec_hooks_body(ec, list, trace_arg);
} }
EC_POP_TAG(); EC_POP_TAG();
if (raised) { if (raised) {
rb_threadptr_set_raised(th); rb_threadptr_set_raised(rb_ec_thread_ptr(ec));
} }
return state; return state;
@ -302,8 +302,8 @@ static void
rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p) rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
{ {
rb_execution_context_t *ec = trace_arg->ec; rb_execution_context_t *ec = trace_arg->ec;
rb_thread_t *th = rb_ec_thread_ptr(ec); rb_vm_t *vm = rb_ec_vm_ptr(ec);
rb_vm_t *vm = th->vm; rb_hook_list_t *th_event_hooks = &rb_ec_thread_ptr(ec)->event_hooks;
if (trace_arg->event & RUBY_INTERNAL_EVENT_MASK) { if (trace_arg->event & RUBY_INTERNAL_EVENT_MASK) {
if (ec->trace_arg && (ec->trace_arg->event & RUBY_INTERNAL_EVENT_MASK)) { if (ec->trace_arg && (ec->trace_arg->event & RUBY_INTERNAL_EVENT_MASK)) {
@ -313,8 +313,8 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
rb_trace_arg_t *prev_trace_arg = ec->trace_arg; rb_trace_arg_t *prev_trace_arg = ec->trace_arg;
vm->trace_running++; vm->trace_running++;
ec->trace_arg = trace_arg; ec->trace_arg = trace_arg;
exec_hooks_unprotected(th, &th->event_hooks, trace_arg); exec_hooks_unprotected(ec, th_event_hooks, trace_arg);
exec_hooks_unprotected(th, &vm->event_hooks, trace_arg); exec_hooks_unprotected(ec, &vm->event_hooks, trace_arg);
ec->trace_arg = prev_trace_arg; ec->trace_arg = prev_trace_arg;
vm->trace_running--; vm->trace_running--;
} }
@ -333,11 +333,11 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
ec->trace_arg = trace_arg; ec->trace_arg = trace_arg;
{ {
/* thread local traces */ /* thread local traces */
state = exec_hooks_protected(th, &th->event_hooks, trace_arg); state = exec_hooks_protected(ec, th_event_hooks, trace_arg);
if (state) goto terminate; if (state) goto terminate;
/* vm global traces */ /* vm global traces */
state = exec_hooks_protected(th, &vm->event_hooks, trace_arg); state = exec_hooks_protected(ec, &vm->event_hooks, trace_arg);
if (state) goto terminate; if (state) goto terminate;
ec->errinfo = errinfo; ec->errinfo = errinfo;
@ -379,35 +379,35 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg)
{ {
volatile int raised; volatile int raised;
VALUE result = Qnil; VALUE result = Qnil;
rb_thread_t *volatile th = GET_THREAD(); rb_execution_context_t *ec = GET_EC();
enum ruby_tag_type state; enum ruby_tag_type state;
const int volatile tracing = th->ec->trace_arg ? 1 : 0; const int volatile tracing = ec->trace_arg ? 1 : 0;
rb_trace_arg_t dummy_trace_arg; rb_trace_arg_t dummy_trace_arg;
dummy_trace_arg.event = 0; dummy_trace_arg.event = 0;
if (!tracing) th->vm->trace_running++; if (!tracing) rb_ec_vm_ptr(ec)->trace_running++;
if (!th->ec->trace_arg) th->ec->trace_arg = &dummy_trace_arg; if (!ec->trace_arg) ec->trace_arg = &dummy_trace_arg;
raised = rb_threadptr_reset_raised(th); raised = rb_ec_reset_raised(ec);
EC_PUSH_TAG(th->ec); EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) { if ((state = EC_EXEC_TAG()) == TAG_NONE) {
result = (*func)(arg); result = (*func)(arg);
} }
EC_POP_TAG(); EC_POP_TAG();
if (raised) { if (raised) {
rb_threadptr_set_raised(th); rb_ec_reset_raised(ec);
} }
if (th->ec->trace_arg == &dummy_trace_arg) th->ec->trace_arg = 0; if (ec->trace_arg == &dummy_trace_arg) ec->trace_arg = NULL;
if (!tracing) th->vm->trace_running--; if (!tracing) rb_ec_vm_ptr(ec)->trace_running--;
if (state) { if (state) {
#if defined RUBY_USE_SETJMPEX && RUBY_USE_SETJMPEX #if defined RUBY_USE_SETJMPEX && RUBY_USE_SETJMPEX
RB_GC_GUARD(result); RB_GC_GUARD(result);
#endif #endif
EC_JUMP_TAG(th->ec, state); EC_JUMP_TAG(ec, state);
} }
return result; return result;