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

Revert "Fix crash caused by concurrent ObjectSpace.dump_all calls"

Browse Source 
This reverts commit 9a62fd3cbae2ebb60e2f9cad782af1ad18db4319.
This commit is contained in:
Jean Boussier 2023-11-13 08:13:33 +01:00
parent 9ca41e9991
commit a1887f4dc2
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gc.c
View File

@ -11935,11 +11935,7 @@ static void
reachable_objects_from_callback(VALUE obj)
{
rb_ractor_t *cr = GET_RACTOR();
struct gc_mark_func_data_struct *cur_mfd = cr->mfd;
cur_mfd->mark_func(obj, cr->mfd->data);
/* mark_func might give up the GVL, in which time some other thread might set
mfd. In that case, set it back to the right value for this thread. */
cr->mfd = cur_mfd;
cr->mfd->mark_func(obj, cr->mfd->data);
}
void

8
test/objspace/test_objspace.rb
View File

@ -918,14 +918,6 @@ class TestObjSpace < Test::Unit::TestCase
assert_equal 2, ObjectSpace.dump_shapes(output: :string, since: RubyVM.stat(:next_shape_id) - 2).lines.size
end
def test_dump_all_in_parallel_bug_19922
dump_ten_times = ->() { 10.times { ObjectSpace.dump_all.tap { _1.close } } }
t = Thread.new { dump_ten_times.call }
dump_ten_times.call
t.value
# Bug #19922 would cause this test to crash.
end
private
def utf8_❨╯°□°❩╯︵┻━┻