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

Fix transient heap mode

Browse Source 
Make sure the transient heap is in the right mode when we finish warming
the heap.  Also ensure the GC isn't allowed to run while we iterate and
mutate the heap.
This commit is contained in:
Aaron Patterson 2023-04-04 09:49:26 -07:00 committed by Jean Boussier
parent ba6ccd8714
commit 87253d047c
Notes: git 2023-04-04 17:49:37 +00:00 
Merged: https://github.com/ruby/ruby/pull/7346
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gc.c
View File

@ -9885,10 +9885,26 @@ rb_gc_prepare_heap(void)
{
gc_start_internal(NULL, Qtrue, Qtrue, Qtrue, Qtrue, Qtrue);
/* The transient heap need to be evacuated before we promote objects */
/* Flush any postponed jobs.
* Transient heap uses postponed jobs to mark things, so we need to
* give it a chance to finish what it was doing. */
rb_postponed_job_flush(GET_VM());
/* The transient heap need to be evacuated before we promote objects.
* First put the transient heap in marking mode so that we can
* evacuate everything. Then evacuate everything. Then finish up
* marking mode so that the transient heap is in the right mode
* for the next GC. */
rb_transient_heap_start_marking(true);
rb_transient_heap_evacuate();
rb_transient_heap_finish_marking();
/* Finally, promote everyone to old gen, but don't let the GC run
* while we iterate over the heap. */
VALUE gc_disabled = rb_gc_disable_no_rest();
rb_objspace_each_objects(gc_promote_object_i, NULL);
if (gc_disabled != Qtrue) rb_gc_enable();
rb_transient_heap_verify();
}
static int