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

Incremental sweeping should not require page allocation

Browse Source 
Incremental sweeping should sweep until we find a slot for objects to
use.  `heap_increment` was adding a page to the heap even though we
would sweep immediately after.

Co-authored-by: John Hawthorn <john@hawthorn.email>
This commit is contained in:
Aaron Patterson 2020-12-01 15:15:14 -08:00 committed by Aaron Patterson
parent 12a121cc0f
commit 0bebea985d
Notes: git 2020-12-03 01:24:11 +09:00 
Merged: https://github.com/ruby/ruby/pull/3837
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gc.c
View File

@ -1911,6 +1911,8 @@ heap_page_create(rb_objspace_t *objspace)
static void static void
heap_add_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page) heap_add_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
{ {
/* Adding to eden heap during incremental sweeping is forbidden */
GC_ASSERT(!(heap == heap_eden && heap->sweeping_page));
page->flags.in_tomb = (heap == heap_tomb); page->flags.in_tomb = (heap == heap_tomb);
list_add(&heap->pages, &page->page_node); list_add(&heap->pages, &page->page_node);
heap->total_pages++; heap->total_pages++;
@ -5095,9 +5097,6 @@ gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *heap)
unsigned int lock_lev; unsigned int lock_lev;
gc_enter(objspace, "sweep_continue", &lock_lev); gc_enter(objspace, "sweep_continue", &lock_lev);
if (objspace->rgengc.need_major_gc == GPR_FLAG_NONE && heap_increment(objspace, heap)) {
gc_report(3, objspace, "gc_sweep_continue: success heap_increment().\n");
}
gc_sweep_step(objspace, heap); gc_sweep_step(objspace, heap);
gc_exit(objspace, "sweep_continue", &lock_lev); gc_exit(objspace, "sweep_continue", &lock_lev);
} }