summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoichi Sasada <ko1@atdot.net>2021-11-09 03:37:17 +0900
committerKoichi Sasada <ko1@atdot.net>2021-11-09 16:21:18 +0900
commit5680c38c75aeb5cbd219aafa8eb48c315f287d97 (patch)
treeb8c87fbd7efc87645c45ddd487b85e26dfc8be17
parent3628616dd10ddbdaa92378264149565295c9f191 (diff)
Use valid `ec` for postponed job.
Postponed job can be registered from non-Ruby thread, which means `ec` in TLS can be NULL. In this case, use main thread's `ec` instead. See https://github.com/ruby/ruby/pull/4108 and https://github.com/ruby/ruby/pull/4336
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/5094
-rw-r--r--vm_trace.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/vm_trace.c b/vm_trace.c
index 63e4c3ac1a..3bc55f2c3a 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -1582,6 +1582,14 @@ postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm,
return PJRR_SUCCESS;
}
+static rb_execution_context_t *
+get_valid_ec(rb_vm_t *vm)
+{
+ rb_execution_context_t *ec = GET_EC();
+ if (ec == NULL) ec = rb_vm_main_ractor_ec(vm);
+ return ec;
+}
+
/*
* return 0 if job buffer is full
* Async-signal-safe
@@ -1589,8 +1597,8 @@ postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm,
int
rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void *data)
{
- rb_execution_context_t *ec = GET_EC();
- rb_vm_t *vm = rb_ec_vm_ptr(ec);
+ rb_vm_t *vm = GET_VM();
+ rb_execution_context_t *ec = get_valid_ec(vm);
begin:
switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB, vm->postponed_job_index)) {
@@ -1608,8 +1616,8 @@ rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void
int
rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, void *data)
{
- rb_execution_context_t *ec = GET_EC();
- rb_vm_t *vm = rb_ec_vm_ptr(ec);
+ rb_vm_t *vm = GET_VM();
+ rb_execution_context_t *ec = get_valid_ec(vm);
rb_postponed_job_t *pjob;
rb_atomic_t i, index;