From 1939d097e650a60557eafbd89a6684f4626e0ad5 Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 26 Jun 2017 07:56:44 +0000 Subject: move several fields from rb_thread_t to rb_execution_context_t. * vm_core.h (rb_thread_t): move several fields which are copied at cont.c to rb_execution_context_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index edae43e50c..8fb7ac0f4d 100644 --- a/thread.c +++ b/thread.c @@ -2038,7 +2038,7 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing) rb_atomic_t interrupt; int postponed_job_interrupt = 0; - if (th->raised_flag) return; + if (th->ec.raised_flag) return; while ((interrupt = threadptr_get_interrupts(th)) != 0) { int sig; @@ -2181,20 +2181,20 @@ rb_threadptr_signal_exit(rb_thread_t *th) int rb_threadptr_set_raised(rb_thread_t *th) { - if (th->raised_flag & RAISED_EXCEPTION) { + if (th->ec.raised_flag & RAISED_EXCEPTION) { return 1; } - th->raised_flag |= RAISED_EXCEPTION; + th->ec.raised_flag |= RAISED_EXCEPTION; return 0; } int rb_threadptr_reset_raised(rb_thread_t *th) { - if (!(th->raised_flag & RAISED_EXCEPTION)) { + if (!(th->ec.raised_flag & RAISED_EXCEPTION)) { return 0; } - th->raised_flag &= ~RAISED_EXCEPTION; + th->ec.raised_flag &= ~RAISED_EXCEPTION; return 1; } @@ -2935,7 +2935,7 @@ rb_thread_safe_level(VALUE thread) rb_thread_t *th; GetThreadPtr(thread, th); - return INT2NUM(th->safe_level); + return INT2NUM(th->ec.safe_level); } /* -- cgit v1.2.3