summaryrefslogtreecommitdiff
path: root/safe.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-26 08:32:49 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-26 08:32:49 +0000
commit837fd5e494731d7d44786f29e7d6e8c27029806f (patch)
tree7ccbb6b6733ccb07c28b7df28e3e2a6b604cc731 /safe.c
parent07f04f468d729b399b794198c61516f2e8ac0a89 (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 'safe.c')
-rw-r--r--safe.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/safe.c b/safe.c
index 2e1ac8b529..d1368d7f5f 100644
--- a/safe.c
+++ b/safe.c
@@ -34,13 +34,13 @@ ruby_safe_level_2_warning(void)
int
rb_safe_level(void)
{
- return GET_THREAD()->ec.safe_level;
+ return GET_THREAD()->ec->safe_level;
}
void
rb_set_safe_level_force(int safe)
{
- GET_THREAD()->ec.safe_level = safe;
+ GET_THREAD()->ec->safe_level = safe;
}
void
@@ -48,11 +48,11 @@ rb_set_safe_level(int level)
{
rb_thread_t *th = GET_THREAD();
- if (level > th->ec.safe_level) {
+ if (level > th->ec->safe_level) {
if (level > SAFE_LEVEL_MAX) {
rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
}
- th->ec.safe_level = level;
+ th->ec->safe_level = level;
}
}
@@ -66,7 +66,7 @@ static void
safe_setter(VALUE val)
{
rb_thread_t *th = GET_THREAD();
- int current_level = th->ec.safe_level;
+ int current_level = th->ec->safe_level;
int level = NUM2INT(val);
if (level == current_level) {
@@ -84,7 +84,7 @@ safe_setter(VALUE val)
/* block parameters */
rb_vm_stack_to_heap(th);
- th->ec.safe_level = level;
+ th->ec->safe_level = level;
}
void