diff options
author | Koichi Sasada <ko1@atdot.net> | 2019-11-29 17:39:06 +0900 |
---|---|---|
committer | Koichi Sasada <ko1@atdot.net> | 2019-11-29 17:47:02 +0900 |
commit | 36da0b3da1aed77e0dffb3f54038f01ff574972b (patch) | |
tree | c314267b99a363bdd97e8025bbc586d2be8c333c /vm_insnhelper.c | |
parent | c4686b92359d298f281f3943ba205858e183e7af (diff) |
check interrupts at each frame pop timing.
Asynchronous events such as signal trap, finalization timing,
thread switching and so on are managed by "interrupt_flag".
Ruby's threads check this flag periodically and if a thread
does not check this flag, above events doesn't happen.
This checking is CHECK_INTS() (related) macro and it is placed
at some places (laeve instruction and so on). However, at the end
of C methods, C blocks (IMEMO_IFUNC) etc there are no checking
and it can introduce uninterruptible thread.
To modify this situation, we decide to place CHECK_INTS() at
vm_pop_frame(). It increases interrupt checking points.
[Bug #16366]
This patch can introduce unexpected events...
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 9eb349d54e..1c54de6375 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -354,6 +354,7 @@ vm_pop_frame(rb_execution_context_t *ec, rb_control_frame_t *cfp, const VALUE *e if (VM_CHECK_MODE >= 4) rb_gc_verify_internal_consistency(); if (VMDEBUG == 2) SDR(); + RUBY_VM_CHECK_INTS(ec); ec->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); return flags & VM_FRAME_FLAG_FINISH; @@ -2318,7 +2319,6 @@ vm_call_iseq_setup_tailcall(rb_execution_context_t *ec, rb_control_frame_t *cfp, iseq->body->stack_max); cfp->sp = sp_orig; - RUBY_VM_CHECK_INTS(ec); return Qundef; } |