kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

trap on non-main ractor

Browse source 
trap can accept blopck/Proc and it can violate Rator isolation,
so the Proc should be isolatable when trap is used on non-main ractor.
This commit is contained in:
Koichi Sasada 2020-12-12 06:54:46 +09:00
parent 124321e0c7
commit 70a311fdeb
Notes: git 2020-12-12 08:37:17 +09:00
3 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bootstraptest/test_ractor.rb
View file

@ -1133,6 +1133,24 @@ assert_equal '[true, false]', %q{
}.take }.take
} }
# Can not trap with not isolated Proc on non-main ractor
assert_equal '[:ok, :ok]', %q{
a = []
Ractor.new{
trap(:INT){p :ok}
}.take
a << :ok
begin
Ractor.new{
s = 'str'
trap(:INT){p s}
}.take
rescue => Ractor::RemoteError
a << :ok
end
}
### ###
### Synchronization tests ### Synchronization tests
### ###

4
common.mk
View file

@ -12692,6 +12692,7 @@ signal.$(OBJEXT): {$(VPATH)}defines.h
signal.$(OBJEXT): {$(VPATH)}encoding.h signal.$(OBJEXT): {$(VPATH)}encoding.h
signal.$(OBJEXT): {$(VPATH)}eval_intern.h signal.$(OBJEXT): {$(VPATH)}eval_intern.h
signal.$(OBJEXT): {$(VPATH)}id.h signal.$(OBJEXT): {$(VPATH)}id.h
signal.$(OBJEXT): {$(VPATH)}id_table.h
signal.$(OBJEXT): {$(VPATH)}intern.h signal.$(OBJEXT): {$(VPATH)}intern.h
signal.$(OBJEXT): {$(VPATH)}internal.h signal.$(OBJEXT): {$(VPATH)}internal.h
signal.$(OBJEXT): {$(VPATH)}internal/anyargs.h signal.$(OBJEXT): {$(VPATH)}internal/anyargs.h
@ -12839,6 +12840,8 @@ signal.$(OBJEXT): {$(VPATH)}missing.h
signal.$(OBJEXT): {$(VPATH)}node.h signal.$(OBJEXT): {$(VPATH)}node.h
signal.$(OBJEXT): {$(VPATH)}onigmo.h signal.$(OBJEXT): {$(VPATH)}onigmo.h
signal.$(OBJEXT): {$(VPATH)}oniguruma.h signal.$(OBJEXT): {$(VPATH)}oniguruma.h
signal.$(OBJEXT): {$(VPATH)}ractor.h
signal.$(OBJEXT): {$(VPATH)}ractor_core.h
signal.$(OBJEXT): {$(VPATH)}ruby_assert.h signal.$(OBJEXT): {$(VPATH)}ruby_assert.h
signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h
signal.$(OBJEXT): {$(VPATH)}signal.c signal.$(OBJEXT): {$(VPATH)}signal.c
@ -12847,6 +12850,7 @@ signal.$(OBJEXT): {$(VPATH)}subst.h
signal.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h signal.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
signal.$(OBJEXT): {$(VPATH)}thread_native.h signal.$(OBJEXT): {$(VPATH)}thread_native.h
signal.$(OBJEXT): {$(VPATH)}vm_core.h signal.$(OBJEXT): {$(VPATH)}vm_core.h
signal.$(OBJEXT): {$(VPATH)}vm_debug.h
signal.$(OBJEXT): {$(VPATH)}vm_opts.h signal.$(OBJEXT): {$(VPATH)}vm_opts.h
sprintf.$(OBJEXT): $(hdrdir)/ruby.h sprintf.$(OBJEXT): $(hdrdir)/ruby.h
sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h

6
signal.c
View file

@ -43,6 +43,7 @@
#include "internal/thread.h" #include "internal/thread.h"
#include "ruby_atomic.h" #include "ruby_atomic.h"
#include "vm_core.h" #include "vm_core.h"
#include "ractor_core.h"
#ifdef NEED_RUBY_ATOMIC_OPS #ifdef NEED_RUBY_ATOMIC_OPS
rb_atomic_t rb_atomic_t
@ -1410,6 +1411,11 @@ sig_trap(int argc, VALUE *argv, VALUE _)
func = trap_handler(&cmd, sig); func = trap_handler(&cmd, sig);
} }
if (rb_obj_is_proc(cmd) &&
!rb_ractor_main_p() && !rb_ractor_shareable_p(cmd)) {
cmd = rb_proc_isolate(cmd);
}
return trap(sig, func, cmd); return trap(sig, func, cmd);
} }