summaryrefslogtreecommitdiff
path: root/thread_win32.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-06 07:44:28 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-06 07:44:28 (GMT)
commit5dfdaa92994096ac7c6713ebd77413271ff4bc41 (patch)
treee8d9634d0184a97f1d342a65b20207b03d272b20 /thread_win32.c
parent5845bd6a718573da5f0f7e53368d2a1dda52f420 (diff)
move rb_thread_t::interrupt_flag and mask
to rb_execution_context_t. * vm_core.h (rb_thread_t): move `rb_thread_t::interrupt_flag` and `rb_thread_t::interrupt_mask` to rb_execution_context_t. RUBY_VM_CHECK_INTS() accepts `ec` instead of `th`. * cont.c (rb_fiber_terminate): to propagate interrupt information, add new parameter `need_interrupt`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.c')
-rw-r--r--thread_win32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/thread_win32.c b/thread_win32.c
index 2e101b4..c82bbfc 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -167,7 +167,7 @@ w32_wait_events(HANDLE *events, int count, DWORD timeout, rb_thread_t *th)
thread_debug(" w32_wait_events events:%p, count:%d, timeout:%ld, th:%p\n",
events, count, timeout, th);
if (th && (intr = th->native_thread_data.interrupt_event)) {
- if (ResetEvent(intr) && (!RUBY_VM_INTERRUPTED(th) || SetEvent(intr))) {
+ if (ResetEvent(intr) && (!RUBY_VM_INTERRUPTED(th->ec) || SetEvent(intr))) {
targets = ALLOCA_N(HANDLE, count + 1);
memcpy(targets, events, sizeof(HANDLE) * count);
@@ -285,7 +285,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv)
th->unblock.arg = th;
native_mutex_unlock(&th->interrupt_lock);
- if (RUBY_VM_INTERRUPTED(th)) {
+ if (RUBY_VM_INTERRUPTED(th->ec)) {
/* interrupted. return immediate */
}
else {