archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 6f727853cee41195b67ee5d793c1ac23fe1a6ae0,b2674c1fd725b43adf51af7935c780359d70c2a4: [Backport #17482]

Browse source 
only main thread can modify vm->ubf_async_safe

	vm->ubf_async_safe is VM global resource and only main thread
	can manipulate it.
	[Bug #17482]
	---
	 thread.c | 8 +++++---
	 1 file changed, 5 insertions(+), 3 deletions(-)

	unblock thread is only for main ractor.

	other ractors should not have a unblock thread.
	This patch fixes 6f727853ce.
	---
	 thread.c | 4 ++--
	 1 file changed, 2 insertions(+), 2 deletions(-)
This commit is contained in:
NARUSE, Yui 2021-02-08 19:13:52 +09:00
parent 6e8e700572
commit 9aba46d8d8
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
thread.c
View file

@ -1650,6 +1650,8 @@ rb_nogvl(void *(*func)(void *), void *data1,
void *val = 0; void *val = 0;
rb_execution_context_t *ec = GET_EC(); rb_execution_context_t *ec = GET_EC();
rb_thread_t *th = rb_ec_thread_ptr(ec); rb_thread_t *th = rb_ec_thread_ptr(ec);
rb_vm_t *vm = rb_ec_vm_ptr(ec);
bool is_main_thread = vm->ractor.main_thread == th;
int saved_errno = 0; int saved_errno = 0;
VALUE ubf_th = Qfalse; VALUE ubf_th = Qfalse;
@ -1657,9 +1659,9 @@ rb_nogvl(void *(*func)(void *), void *data1,
ubf = ubf_select; ubf = ubf_select;
data2 = th; data2 = th;
} }
else if (ubf && rb_ractor_living_thread_num(th->ractor) == 1) { else if (ubf && rb_ractor_living_thread_num(th->ractor) == 1 && is_main_thread) {
if (flags & RB_NOGVL_UBF_ASYNC_SAFE) { if (flags & RB_NOGVL_UBF_ASYNC_SAFE) {
th->vm->ubf_async_safe = 1; vm->ubf_async_safe = 1;
} }
else { else {
ubf_th = rb_thread_start_unblock_thread(); ubf_th = rb_thread_start_unblock_thread();
@ -1671,7 +1673,7 @@ rb_nogvl(void *(*func)(void *), void *data1,
saved_errno = errno; saved_errno = errno;
}, ubf, data2, flags & RB_NOGVL_INTR_FAIL); }, ubf, data2, flags & RB_NOGVL_INTR_FAIL);
th->vm->ubf_async_safe = 0; if (is_main_thread) vm->ubf_async_safe = 0;
if ((flags & RB_NOGVL_INTR_FAIL) == 0) { if ((flags & RB_NOGVL_INTR_FAIL) == 0) {
RUBY_VM_CHECK_INTS_BLOCKING(ec); RUBY_VM_CHECK_INTS_BLOCKING(ec);

4
version.h
View file

@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 38 #define RUBY_PATCHLEVEL 40
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 7 #define RUBY_RELEASE_DAY 8
#include "ruby/version.h" #include "ruby/version.h"