diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-07 05:06:50 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-07 05:06:50 +0000 |
| commit | da9869625a7d73c844db27dfe09e574b43481877 (patch) | |
| tree | 3bca30deeb173ff8454859b2e57d690769caabf2 /vm_backtrace.c | |
| parent | af8a7df3b66019043907fa066934e81a4ef2072f (diff) | |
| download | ruby-da9869625a7d73c844db27dfe09e574b43481877.tar.gz | |
* vm_backtrace.c (rb_debug_inspector_t): `th` -> `ec`.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_backtrace.c')
| -rw-r--r-- | vm_backtrace.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vm_backtrace.c b/vm_backtrace.c index a10f848daf..69772180f6 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -1057,7 +1057,7 @@ RUBY_SYMBOL_EXPORT_BEGIN RUBY_SYMBOL_EXPORT_END struct rb_debug_inspector_struct { - rb_thread_t *th; + rb_execution_context_t *ec; rb_control_frame_t *cfp; VALUE backtrace; VALUE contexts; /* [[klass, binding, iseq, cfp], ...] */ @@ -1130,7 +1130,7 @@ collect_caller_bindings_cfunc(void *arg, const rb_control_frame_t *cfp, ID mid) } static VALUE -collect_caller_bindings(rb_thread_t *th) +collect_caller_bindings(const rb_execution_context_t *ec) { struct collect_caller_bindings_data data; VALUE result; @@ -1138,7 +1138,7 @@ collect_caller_bindings(rb_thread_t *th) data.ary = rb_ary_new(); - backtrace_each(th->ec, + backtrace_each(ec, collect_caller_bindings_init, collect_caller_bindings_iseq, collect_caller_bindings_cfunc, @@ -1153,7 +1153,7 @@ collect_caller_bindings(rb_thread_t *th) if (!NIL_P(cfp_val)) { rb_control_frame_t *cfp = GC_GUARDED_PTR_REF(cfp_val); - rb_ary_store(entry, CALLER_BINDING_BINDING, rb_vm_make_binding(th->ec, cfp)); + rb_ary_store(entry, CALLER_BINDING_BINDING, rb_vm_make_binding(ec, cfp)); } } @@ -1169,17 +1169,17 @@ VALUE rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data) { rb_debug_inspector_t dbg_context; - rb_thread_t * volatile th = GET_THREAD(); + rb_execution_context_t *ec = GET_EC(); enum ruby_tag_type state; volatile VALUE MAYBE_UNUSED(result); - dbg_context.th = th; - dbg_context.cfp = dbg_context.th->ec->cfp; - dbg_context.backtrace = rb_ec_backtrace_location_ary(th->ec, 0, 0); + dbg_context.ec = ec; + dbg_context.cfp = dbg_context.ec->cfp; + dbg_context.backtrace = rb_ec_backtrace_location_ary(ec, 0, 0); dbg_context.backtrace_size = RARRAY_LEN(dbg_context.backtrace); - dbg_context.contexts = collect_caller_bindings(th); + dbg_context.contexts = collect_caller_bindings(ec); - EC_PUSH_TAG(th->ec); + EC_PUSH_TAG(ec); if ((state = EXEC_TAG()) == TAG_NONE) { result = (*func)(&dbg_context, data); } @@ -1188,7 +1188,7 @@ rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data) /* invalidate bindings? */ if (state) { - EC_JUMP_TAG(th->ec, state); + EC_JUMP_TAG(ec, state); } return result; |