diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 08:32:49 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 08:32:49 +0000 |
| commit | 837fd5e494731d7d44786f29e7d6e8c27029806f (patch) | |
| tree | 7ccbb6b6733ccb07c28b7df28e3e2a6b604cc731 /vm_backtrace.c | |
| parent | 07f04f468d729b399b794198c61516f2e8ac0a89 (diff) | |
| download | ruby-837fd5e494731d7d44786f29e7d6e8c27029806f.tar.gz | |
Use rb_execution_context_t instead of rb_thread_t
to represent execution context [Feature #14038]
* vm_core.h (rb_thread_t): rb_thread_t::ec is now a pointer.
There are many code using `th` to represent execution context
(such as cfp, VM stack and so on). To access `ec`, they need to
use `th->ec->...` (adding one indirection) so that we need to
replace them by passing `ec` instead of `th`.
* vm_core.h (GET_EC()): introduced to access current ec. Also
remove `ruby_current_thread` global variable.
* cont.c (rb_context_t): introduce rb_context_t::thread_ptr instead of
rb_context_t::thread_value.
* cont.c (ec_set_vm_stack): added to update vm_stack explicitly.
* cont.c (ec_switch): added to switch ec explicitly.
* cont.c (rb_fiber_close): added to terminate fibers explicitly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_backtrace.c')
| -rw-r--r-- | vm_backtrace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vm_backtrace.c b/vm_backtrace.c index aab62ea072..54ffc6baec 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -427,7 +427,7 @@ backtrace_each(rb_thread_t *th, void (*iter_cfunc)(void *arg, const rb_control_frame_t *cfp, ID mid), void *arg) { - rb_control_frame_t *last_cfp = th->ec.cfp; + rb_control_frame_t *last_cfp = th->ec->cfp; rb_control_frame_t *start_cfp = RUBY_VM_END_CONTROL_FRAME(th); rb_control_frame_t *cfp; ptrdiff_t size, i; @@ -439,7 +439,7 @@ backtrace_each(rb_thread_t *th, * top frame * ... * 2nd frame <- lev:0 - * current frame <- th->ec.cfp + * current frame <- th->ec->cfp */ start_cfp = @@ -1172,12 +1172,12 @@ VALUE rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data) { rb_debug_inspector_t dbg_context; - rb_thread_t *th = GET_THREAD(); + rb_thread_t * volatile th = GET_THREAD(); enum ruby_tag_type state; volatile VALUE MAYBE_UNUSED(result); dbg_context.th = th; - dbg_context.cfp = dbg_context.th->ec.cfp; + dbg_context.cfp = dbg_context.th->ec->cfp; dbg_context.backtrace = rb_threadptr_backtrace_location_ary(th, 0, 0); dbg_context.backtrace_size = RARRAY_LEN(dbg_context.backtrace); dbg_context.contexts = collect_caller_bindings(th); @@ -1247,7 +1247,7 @@ rb_profile_frames(int start, int limit, VALUE *buff, int *lines) { int i; rb_thread_t *th = GET_THREAD(); - rb_control_frame_t *cfp = th->ec.cfp, *end_cfp = RUBY_VM_END_CONTROL_FRAME(th); + rb_control_frame_t *cfp = th->ec->cfp, *end_cfp = RUBY_VM_END_CONTROL_FRAME(th); const rb_callable_method_entry_t *cme; for (i=0; i<limit && cfp != end_cfp;) { |