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 /load.c | |
parent | 07f04f468d729b399b794198c61516f2e8ac0a89 (diff) |
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 'load.c')
-rw-r--r-- | load.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -587,7 +587,7 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap) rb_thread_t *volatile th0 = th; #endif - th->ec.errinfo = Qnil; /* ensure */ + th->ec->errinfo = Qnil; /* ensure */ if (!wrap) { th->top_wrapper = 0; @@ -631,11 +631,11 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap) * rb_iseq_load_iseq case */ VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef); if (NIL_P(exc)) return state; - th->ec.errinfo = exc; + th->ec->errinfo = exc; return TAG_RAISE; } - if (!NIL_P(th->ec.errinfo)) { + if (!NIL_P(th->ec->errinfo)) { /* exception during load */ return TAG_RAISE; } @@ -648,7 +648,7 @@ rb_load_internal(VALUE fname, int wrap) rb_thread_t *curr_th = GET_THREAD(); int state = rb_load_internal0(curr_th, fname, wrap); if (state) { - if (state == TAG_RAISE) rb_exc_raise(curr_th->ec.errinfo); + if (state == TAG_RAISE) rb_exc_raise(curr_th->ec->errinfo); TH_JUMP_TAG(curr_th, state); } } @@ -963,7 +963,7 @@ rb_require_internal(VALUE fname, int safe) { volatile int result = -1; rb_thread_t *th = GET_THREAD(); - volatile VALUE errinfo = th->ec.errinfo; + volatile VALUE errinfo = th->ec->errinfo; enum ruby_tag_type state; struct { int safe; @@ -1024,7 +1024,7 @@ rb_require_internal(VALUE fname, int safe) return state; } - th->ec.errinfo = errinfo; + th->ec->errinfo = errinfo; RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname)); |