summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorKoichi Sasada <ko1@atdot.net>2021-02-03 03:19:51 +0900
committerKoichi Sasada <ko1@atdot.net>2021-02-03 08:53:02 +0900
commit6f727853cee41195b67ee5d793c1ac23fe1a6ae0 (patch)
tree5ae730e348006b8ed2abc720556ea0f2cebb10be /thread.c
parentc0fa4c7bbe461b91974a34698ddbb116f737da21 (diff)
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]
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4147
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/thread.c b/thread.c
index dce181d24e..f1d8c9ae27 100644
--- a/thread.c
+++ b/thread.c
@@ -1650,6 +1650,8 @@ rb_nogvl(void *(*func)(void *), void *data1,
void *val = 0;
rb_execution_context_t *ec = GET_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;
VALUE ubf_th = Qfalse;
@@ -1658,8 +1660,8 @@ rb_nogvl(void *(*func)(void *), void *data1,
data2 = th;
}
else if (ubf && rb_ractor_living_thread_num(th->ractor) == 1) {
- if (flags & RB_NOGVL_UBF_ASYNC_SAFE) {
- th->vm->ubf_async_safe = 1;
+ if (is_main_thread && flags & RB_NOGVL_UBF_ASYNC_SAFE) {
+ vm->ubf_async_safe = 1;
}
else {
ubf_th = rb_thread_start_unblock_thread();
@@ -1671,7 +1673,7 @@ rb_nogvl(void *(*func)(void *), void *data1,
saved_errno = errno;
}, 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) {
RUBY_VM_CHECK_INTS_BLOCKING(ec);