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

Use valid ec for postponed job.

Browse source 
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
This commit is contained in:
Koichi Sasada 2021-11-09 03:37:17 +09:00
parent 3628616dd1
commit 5680c38c75
Notes: git 2021-11-09 16:21:39 +09:00 
Merged: https://github.com/ruby/ruby/pull/5094
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
vm_trace.c
View file

@ -1582,6 +1582,14 @@ postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm,
return PJRR_SUCCESS; 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 * return 0 if job buffer is full
* Async-signal-safe * Async-signal-safe
@ -1589,8 +1597,8 @@ postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm,
int int
rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void *data) 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 = GET_VM();
rb_vm_t *vm = rb_ec_vm_ptr(ec); rb_execution_context_t *ec = get_valid_ec(vm);
begin: begin:
switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB, vm->postponed_job_index)) { 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 int
rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, void *data) 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 = GET_VM();
rb_vm_t *vm = rb_ec_vm_ptr(ec); rb_execution_context_t *ec = get_valid_ec(vm);
rb_postponed_job_t *pjob; rb_postponed_job_t *pjob;
rb_atomic_t i, index; rb_atomic_t i, index;