mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
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
This commit is contained in:
parent
07f04f468d
commit
837fd5e494
32 changed files with 743 additions and 576 deletions
10
vm_exec.c
10
vm_exec.c
|
@ -84,7 +84,7 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
|
|||
#undef RESTORE_REGS
|
||||
#define RESTORE_REGS() \
|
||||
{ \
|
||||
VM_REG_CFP = th->ec.cfp; \
|
||||
VM_REG_CFP = th->ec->cfp; \
|
||||
reg_pc = reg_cfp->pc; \
|
||||
}
|
||||
|
||||
|
@ -102,7 +102,7 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
|
|||
return (VALUE)insns_address_table;
|
||||
}
|
||||
#endif
|
||||
reg_cfp = th->ec.cfp;
|
||||
reg_cfp = th->ec->cfp;
|
||||
reg_pc = reg_cfp->pc;
|
||||
|
||||
#if OPT_STACK_CACHING
|
||||
|
@ -142,7 +142,7 @@ rb_vm_get_insns_address_table(void)
|
|||
static VALUE
|
||||
vm_exec_core(rb_thread_t *th, VALUE initial)
|
||||
{
|
||||
register rb_control_frame_t *reg_cfp = th->ec.cfp;
|
||||
register rb_control_frame_t *reg_cfp = th->ec->cfp;
|
||||
|
||||
while (1) {
|
||||
reg_cfp = ((rb_insn_func_t) (*GET_PC()))(th, reg_cfp);
|
||||
|
@ -158,8 +158,8 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
|
|||
return ret;
|
||||
}
|
||||
else {
|
||||
VALUE err = th->ec.errinfo;
|
||||
th->ec.errinfo = Qnil;
|
||||
VALUE err = th->ec->errinfo;
|
||||
th->ec->errinfo = Qnil;
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue