From fbad5b97e8a42304b73b6141b57fb8ac45565ec2 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 29 Jan 2019 05:31:00 +0000 Subject: merge revision(s) 66708: [Backport #15499] thread.c (call_without_gvl): spawn thread for UBF iff single-threaded We need another native thread to call some unblocking functions which aren't RUBY_UBF_IO or RUBY_UBF_PROCESS. Instead of a permanent thread in <= 2.5, we can now rely on the thread cache feature to perform interrupts. [ruby-core:90865] [Bug #15499] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 58e7651446..eca14b4b4c 100644 --- a/thread.c +++ b/thread.c @@ -1429,11 +1429,15 @@ call_without_gvl(void *(*func)(void *), void *data1, rb_execution_context_t *ec = GET_EC(); rb_thread_t *th = rb_ec_thread_ptr(ec); int saved_errno = 0; + VALUE ubf_th = Qfalse; if (ubf == RUBY_UBF_IO || ubf == RUBY_UBF_PROCESS) { ubf = ubf_select; data2 = th; } + else if (ubf && vm_living_thread_num(th->vm) == 1) { + ubf_th = rb_thread_start_unblock_thread(); + } BLOCKING_REGION(th, { val = func(data1); @@ -1444,6 +1448,10 @@ call_without_gvl(void *(*func)(void *), void *data1, RUBY_VM_CHECK_INTS_BLOCKING(ec); } + if (ubf_th != Qfalse) { + thread_value(rb_thread_kill(ubf_th)); + } + errno = saved_errno; return val; -- cgit v1.2.3