1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rb_vm_t::postponed_job_index shall be rb_atomic_t

Browse Source 
Pointer to this field is passed to ATOMIC_CAS.  We have to use
rb_atomic_t for that purpose.
This commit is contained in:
卜部昌平 2020-01-31 16:15:28 +09:00
parent ce4ea956d2
commit 34f8e75f93
Notes: git 2020-02-06 11:47:21 +09:00 
Merged: https://github.com/ruby/ruby/pull/2885
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm_core.h
View File

@ -642,7 +642,7 @@ typedef struct rb_vm_struct {
/* postponed_job (async-signal-safe, NOT thread-safe) */
struct rb_postponed_job_struct *postponed_job_buffer;
int postponed_job_index;
rb_atomic_t postponed_job_index;
int src_encoding_index;

6
vm_trace.c
View File

@ -1559,7 +1559,7 @@ enum postponed_job_register_result {
/* Async-signal-safe */
static enum postponed_job_register_result
postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm,
unsigned int flags, rb_postponed_job_func_t func, void *data, int max, int expected_index)
unsigned int flags, rb_postponed_job_func_t func, void *data, rb_atomic_t max, rb_atomic_t expected_index)
{
rb_postponed_job_t *pjob;
@ -1610,7 +1610,7 @@ rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func,
rb_execution_context_t *ec = GET_EC();
rb_vm_t *vm = rb_ec_vm_ptr(ec);
rb_postponed_job_t *pjob;
int i, index;
rb_atomic_t i, index;
begin:
index = vm->postponed_job_index;
@ -1673,7 +1673,7 @@ rb_postponed_job_flush(rb_vm_t *vm)
{
EC_PUSH_TAG(ec);
if (EC_EXEC_TAG() == TAG_NONE) {
int index;
rb_atomic_t index;
struct rb_workqueue_job *wq_job;
while ((index = vm->postponed_job_index) > 0) {