archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix releasing timing.

Browse source 
(1) recorded_lock_rec > current_lock_rec should not be occurred
    on rb_ec_vm_lock_rec_release().
(2) should be release VM lock at EXEC_TAG(), not POP_TAG().
(3) some refactoring.
This commit is contained in:
Koichi Sasada 2020-10-14 14:21:57 +09:00
parent 0714cb760c
commit ae693fff74
Notes: git 2020-10-14 16:37:22 +09:00
3 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

21
vm_sync.c
View file

@ -116,6 +116,7 @@ vm_lock_leave(rb_vm_t *vm, unsigned int *lev APPEND_LOCATION_ARGS)
VM_ASSERT(vm->ractor.sync.lock_rec == *lev);
vm->ractor.sync.lock_rec--;
*lev = vm->ractor.sync.lock_rec;
if (vm->ractor.sync.lock_rec == 0) {
vm->ractor.sync.lock_owner = NULL;
@ -248,21 +249,19 @@ rb_vm_barrier(void)
}
void
rb_ec_vm_lock_rec_release(rb_execution_context_t *ec, int recorded_lock_rec)
rb_ec_vm_lock_rec_release(const rb_execution_context_t *ec,
unsigned int recorded_lock_rec,
unsigned int current_lock_rec)
{
int current_lock_rec = rb_ec_vm_lock_rec(ec);
unsigned int lev;
VM_ASSERT(recorded_lock_rec != current_lock_rec);
bp();
if (recorded_lock_rec > current_lock_rec) {
for (; recorded_lock_rec > current_lock_rec; current_lock_rec++) {
RB_VM_LOCK_ENTER_LEV(&lev);
}
if (UNLIKELY(recorded_lock_rec > current_lock_rec)) {
rb_bug("unexpected situation - recordd:%u current:%u",
recorded_lock_rec, current_lock_rec);
}
else {
for (; recorded_lock_rec < current_lock_rec; current_lock_rec--) {
RB_VM_LOCK_LEAVE_LEV(&lev);
while (recorded_lock_rec < current_lock_rec) {
RB_VM_LOCK_LEAVE_LEV(&current_lock_rec);
}
}