diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-06 07:44:28 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-06 07:44:28 +0000 |
| commit | 1096d702ed9e4cbc26499fe3749acc7f3609da8f (patch) | |
| tree | e8d9634d0184a97f1d342a65b20207b03d272b20 /thread_pthread.c | |
| parent | f0f7f42e8810fe80056df83771004c52fea28b08 (diff) | |
| download | ruby-1096d702ed9e4cbc26499fe3749acc7f3609da8f.tar.gz | |
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_pthread.c')
| -rw-r--r-- | thread_pthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 968d7e1f86..686c219ecb 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1132,7 +1132,7 @@ native_sleep(rb_thread_t *th, struct timeval *timeout_tv) th->unblock.func = ubf_pthread_cond_signal; th->unblock.arg = th; - if (RUBY_VM_INTERRUPTED(th)) { + if (RUBY_VM_INTERRUPTED(th->ec)) { /* interrupted. return immediate */ thread_debug("native_sleep: interrupted before sleep\n"); } |