diff options
| author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-01-31 16:15:28 +0900 |
|---|---|---|
| committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-02-06 11:46:51 +0900 |
| commit | 34f8e75f9305b0da4ef1b0d4fe9ea3c3f31dcc22 (patch) | |
| tree | e4309113aa1e41e4677e881260a527e761dd4a6e | |
| parent | ce4ea956d24eab5089a143bba38126f2b11b55b6 (diff) | |
| download | ruby-34f8e75f9305b0da4ef1b0d4fe9ea3c3f31dcc22.tar.gz | |
rb_vm_t::postponed_job_index shall be rb_atomic_t
Pointer to this field is passed to ATOMIC_CAS. We have to use
rb_atomic_t for that purpose.
| -rw-r--r-- | vm_core.h | 2 | ||||
| -rw-r--r-- | vm_trace.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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; diff --git a/vm_trace.c b/vm_trace.c index e72c618739..f1aa35d664 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -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) { |