suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

incremental GC: avoid already-finished finalizaton work

Browse Source 
Avoid extra work svaing finalization information and
re-chaining old-generation records for a major GC.
This commit is contained in:
Matthew Flatt 2015-12-06 08:43:36 -05:00
parent e44926fcee
commit 715bdbb49e
3 changed files with 191 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
racket/src/racket/gc2/newgc.c
View File

@ -2065,6 +2065,7 @@ inline static int marked(NewGC *gc, const void *p)
switch(page->size_class) { switch(page->size_class) {
case SIZE_CLASS_SMALL_PAGE: case SIZE_CLASS_SMALL_PAGE:
if ((page->generation >= AGE_GEN_1) && !gc->inc_gen1) { if ((page->generation >= AGE_GEN_1) && !gc->inc_gen1) {
GC_ASSERT(!gc->finished_incremental);
if ((NUM(page->addr) + page->scan_boundary) > NUM(p)) if ((NUM(page->addr) + page->scan_boundary) > NUM(p))
return 1; return 1;
} }
@ -2749,7 +2750,7 @@ static void push_ptr(NewGC *gc, void *ptr, int inc_gen1)
#endif #endif
GC_ASSERT(inc_gen1 || !gc->inc_gen1); GC_ASSERT(inc_gen1 || !gc->inc_gen1);
GC_ASSERT(!inc_gen1 || !gc->finishing_incremental); GC_ASSERT(!inc_gen1 || !gc->all_marked_incremental);
push_ptr_at(ptr, inc_gen1 ? &gc->inc_mark_stack : &gc->mark_stack); push_ptr_at(ptr, inc_gen1 ? &gc->inc_mark_stack : &gc->mark_stack);
} }
@ -3084,9 +3085,13 @@ static int designate_modified_gc(NewGC *gc, void *p)
mpage *page = pagemap_find_page(gc->page_maps, p); mpage *page = pagemap_find_page(gc->page_maps, p);
if (gc->no_further_modifications) { if (gc->no_further_modifications) {
if (page && (page->generation >= AGE_GEN_1) && gc->inc_gen1 && page->mprotected) { if (page && (page->generation >= AGE_GEN_1) && page->mprotected
/* Some marking functions, like the one for weak boxes, /* Some marking functions, like the one for weak boxes,
update the record, so it's ok to make the page writable. */ update the record, so it's ok to make the page writable. */
&& (gc->inc_gen1
/* Memory accounting can also modify otherwise unadjusted
pages after incrementa mode: */
|| (gc->doing_memory_accounting && gc->finished_incremental))) {
check_incremental_unprotect(gc, page); check_incremental_unprotect(gc, page);
return 1; return 1;
} }
@ -3692,8 +3697,7 @@ intptr_t GC_get_memory_use(void *o)
static void check_incremental_unprotect(NewGC *gc, mpage *page) static void check_incremental_unprotect(NewGC *gc, mpage *page)
{ {
/* must be due to incremental GC */ /* must be due to incremental GC */
GC_ASSERT(!gc->gc_full); GC_ASSERT(!gc->gc_full || gc->finished_incremental);
GC_ASSERT(gc->mark_gen1);
if (page->mprotected) { if (page->mprotected) {
page->mprotected = 0; page->mprotected = 0;
@ -3711,9 +3715,13 @@ static void page_newly_marked_on(NewGC *gc, mpage *page, int is_a_master_page, i
/* If this page isn't already marked as old, it must be a medium page whose /* If this page isn't already marked as old, it must be a medium page whose
generation will be updated in the clean-up phase */ generation will be updated in the clean-up phase */
GC_ASSERT((page->generation >= AGE_GEN_1) || (page->size_class == SIZE_CLASS_MED_PAGE)); GC_ASSERT((page->generation >= AGE_GEN_1) || (page->size_class == SIZE_CLASS_MED_PAGE));
GC_ASSERT(!gc->finished_incremental);
GC_ASSERT(!page->non_dead_as_mark);
page->inc_marked_on = 1; page->inc_marked_on = 1;
page->inc_modified_next = gc->inc_modified_next; page->inc_modified_next = gc->inc_modified_next;
gc->inc_modified_next = page; gc->inc_modified_next = page;
if (!gc->inc_repair_next)
gc->inc_repair_next = page;
} else { } else {
GC_ASSERT(!page->marked_on); GC_ASSERT(!page->marked_on);
page->marked_on = 1; page->marked_on = 1;
@ -3849,6 +3857,10 @@ void GC_mark2(void *pp, struct NewGC *gc)
/* in this case, it has not. So we want to mark it, first off. */ /* in this case, it has not. So we want to mark it, first off. */
page->size_class = SIZE_CLASS_BIG_PAGE_MARKED; page->size_class = SIZE_CLASS_BIG_PAGE_MARKED;
GC_ASSERT((page->generation < AGE_GEN_1)
|| is_a_master_page
|| (!gc->all_marked_incremental && !gc->finished_incremental));
/* if this is in the nursery, we want to move it out of the nursery */ /* if this is in the nursery, we want to move it out of the nursery */
if((page->generation == AGE_GEN_0) && !is_a_master_page) { if((page->generation == AGE_GEN_0) && !is_a_master_page) {
GC_ASSERT(!gc->inc_gen1); GC_ASSERT(!gc->inc_gen1);
@ -3883,6 +3895,9 @@ void GC_mark2(void *pp, struct NewGC *gc)
RELEASE_PAGE_LOCK(is_a_master_page, page); RELEASE_PAGE_LOCK(is_a_master_page, page);
return; return;
} }
GC_ASSERT((page->generation < AGE_GEN_1)
|| is_a_master_page
|| (!gc->all_marked_incremental && !gc->finished_incremental));
if ((page->generation == AGE_GEN_0) || gc->gc_full) { if ((page->generation == AGE_GEN_0) || gc->gc_full) {
GC_ASSERT(!gc->inc_gen1); GC_ASSERT(!gc->inc_gen1);
inc_gen1 = 0; inc_gen1 = 0;
@ -3890,6 +3905,7 @@ void GC_mark2(void *pp, struct NewGC *gc)
if (is_a_master_page) if (is_a_master_page)
inc_gen1 = 0; inc_gen1 = 0;
else { else {
GC_ASSERT(!gc->all_marked_incremental && !gc->finished_incremental);
inc_gen1 = 1; inc_gen1 = 1;
check_incremental_unprotect(gc, page); check_incremental_unprotect(gc, page);
} }
@ -3915,6 +3931,10 @@ void GC_mark2(void *pp, struct NewGC *gc)
return; return;
} }
GC_ASSERT((page->generation < AGE_GEN_1)
|| is_a_master_page
|| (!gc->all_marked_incremental && !gc->finished_incremental));
/* what we do next depends on whether this is a gen0, gen_half, or gen1 /* what we do next depends on whether this is a gen0, gen_half, or gen1
object */ object */
if (page->generation >= AGE_GEN_1) { if (page->generation >= AGE_GEN_1) {
@ -3941,6 +3961,7 @@ void GC_mark2(void *pp, struct NewGC *gc)
if (is_a_master_page) { if (is_a_master_page) {
inc_gen1 = 0; inc_gen1 = 0;
} else { } else {
GC_ASSERT(!gc->all_marked_incremental && !gc->finished_incremental);
check_incremental_unprotect(gc, page); check_incremental_unprotect(gc, page);
inc_gen1 = 1; inc_gen1 = 1;
} }
@ -4589,7 +4610,7 @@ void *GC_next_tagged_start(void *p)
/* garbage collection */ /* garbage collection */
/*****************************************************************************/ /*****************************************************************************/
static void reset_gen1_pages_scan_boundaries(NewGC *gc) static void reset_gen1_pages_scan_boundaries_and_writable(NewGC *gc)
{ {
mpage *work; mpage *work;
int i; int i;
@ -4695,7 +4716,7 @@ static void mark_backpointers(NewGC *gc)
/* must be a big page */ /* must be a big page */
if (work->size_class == SIZE_CLASS_BIG_PAGE_MARKED) if (work->size_class == SIZE_CLASS_BIG_PAGE_MARKED)
mark_traverse_object(gc, PPTR(BIG_PAGE_TO_OBJECT(work)), PAGE_END_VSS(work), work->page_type); mark_traverse_object(gc, PPTR(BIG_PAGE_TO_OBJECT(work)), PAGE_END_VSS(work), work->page_type);
else if (!gc->gc_full) else if (!gc->gc_full && !gc->all_marked_incremental)
mark_traverse_object_no_gen1(gc, PPTR(BIG_PAGE_TO_OBJECT(work)), PAGE_END_VSS(work), work->page_type); mark_traverse_object_no_gen1(gc, PPTR(BIG_PAGE_TO_OBJECT(work)), PAGE_END_VSS(work), work->page_type);
gc->memory_in_use -= work->size; gc->memory_in_use -= work->size;
} else if (work->size_class == SIZE_CLASS_SMALL_PAGE) { } else if (work->size_class == SIZE_CLASS_SMALL_PAGE) {
@ -4712,7 +4733,7 @@ static void mark_backpointers(NewGC *gc)
if (!info->dead) { if (!info->dead) {
if (info->mark || work->non_dead_as_mark) if (info->mark || work->non_dead_as_mark)
mark_traverse_object(gc, PPTR(OBJHEAD_TO_OBJPTR(start)), PPTR(info) + info->size, info->type); mark_traverse_object(gc, PPTR(OBJHEAD_TO_OBJPTR(start)), PPTR(info) + info->size, info->type);
else if (!gc->gc_full else if ((!gc->gc_full && !gc->all_marked_incremental)
/* Totally ad hoc; supports closure prefixes */ /* Totally ad hoc; supports closure prefixes */
|| ((info->type == PAGE_TAGGED) || ((info->type == PAGE_TAGGED)
&& gc->treat_as_incremental_mark_hook && gc->treat_as_incremental_mark_hook
@ -4735,7 +4756,7 @@ static void mark_backpointers(NewGC *gc)
if (!info->dead) { if (!info->dead) {
if (info->mark || work->non_dead_as_mark) if (info->mark || work->non_dead_as_mark)
mark_traverse_object(gc, PPTR(OBJHEAD_TO_OBJPTR(start)), PPTR(info) + info->size, info->type); mark_traverse_object(gc, PPTR(OBJHEAD_TO_OBJPTR(start)), PPTR(info) + info->size, info->type);
else if (!gc->gc_full) else if (!gc->gc_full && !gc->all_marked_incremental)
mark_traverse_object_no_gen1(gc, PPTR(OBJHEAD_TO_OBJPTR(start)), PPTR(info) + info->size, info->type); mark_traverse_object_no_gen1(gc, PPTR(OBJHEAD_TO_OBJPTR(start)), PPTR(info) + info->size, info->type);
} }
start += info->size; start += info->size;
@ -4832,8 +4853,8 @@ inline static void do_heap_compact(NewGC *gc)
int i, compact_count = 0, noncompact_count = 0; int i, compact_count = 0, noncompact_count = 0;
int tic_tock = gc->num_major_collects % 2; int tic_tock = gc->num_major_collects % 2;
/* incremental mode disables old-generation compaction: */ /* Cannot compact old generation if we've finished marking: */
if (gc->started_incremental && !gc->compact_even_incremental) if (gc->all_marked_incremental)
return; return;
mmu_prep_for_compaction(gc->mmu); mmu_prep_for_compaction(gc->mmu);
@ -5097,7 +5118,7 @@ static void repair_heap(NewGC *gc)
memory_in_use = gc->memory_in_use; memory_in_use = gc->memory_in_use;
need_fixup = gc->need_fixup; need_fixup = gc->need_fixup;
minor_for_incremental = !gc->gc_full && gc->mark_gen1; minor_for_incremental = !gc->gc_full && gc->started_incremental;
for (; page; page = next) { for (; page; page = next) {
GC_ASSERT(page->marked_on || page->marked_from); GC_ASSERT(page->marked_on || page->marked_from);
@ -5109,7 +5130,7 @@ static void repair_heap(NewGC *gc)
if (gc->gc_full) if (gc->gc_full)
page->marked_on = 1; page->marked_on = 1;
else { else {
if (gc->mark_gen1 && page->marked_on) if (minor_for_incremental && page->marked_on)
page_marked_on(gc, page, 0, 1); page_marked_on(gc, page, 0, 1);
page->marked_on = 0; page->marked_on = 0;
} }
@ -5334,8 +5355,14 @@ static void repair_heap(NewGC *gc)
if (page->reprotect) { if (page->reprotect) {
/* must have been set for incremental, but also used for new gen1 objects /* must have been set for incremental, but also used for new gen1 objects
moved from gen0 */ moved from gen0 */
GC_ASSERT(!gc->gc_full); GC_ASSERT(!gc->gc_full || gc->finished_incremental);
GC_ASSERT(gc->mark_gen1); GC_ASSERT(gc->mark_gen1);
} else {
if (page->mprotected) {
/* This only happens for a full collection to wrap up a
finished incremental collection; the page wasn't
touched at al in the wrap-up */
GC_ASSERT(gc->gc_full && gc->finished_incremental);
} else { } else {
page->reprotect_next = gc->reprotect_next; page->reprotect_next = gc->reprotect_next;
gc->reprotect_next = page; gc->reprotect_next = page;
@ -5344,6 +5371,7 @@ static void repair_heap(NewGC *gc)
} }
} }
} }
}
/* All gen-half pages count as modified: */ /* All gen-half pages count as modified: */
if (need_fixup) { if (need_fixup) {
@ -5411,6 +5439,7 @@ static void repair_heap(NewGC *gc)
static void incremental_repair_pages(NewGC *gc, int fuel) static void incremental_repair_pages(NewGC *gc, int fuel)
{ {
mpage *page; mpage *page;
int retry = 1;
#if 0 #if 0
/* Make sure `gc->inc_repair_next` is a tail of `gc->inc_modified_next` */ /* Make sure `gc->inc_repair_next` is a tail of `gc->inc_modified_next` */
@ -5433,7 +5462,11 @@ static void incremental_repair_pages(NewGC *gc, int fuel)
/* skip */ /* skip */
} else { } else {
if (page->non_dead_as_mark) { if (page->non_dead_as_mark) {
/* hit already-repaired tail; no more to repair */ /* hit already-repaired tail; no more to repair here */
if (retry) {
retry = 0;
gc->inc_repair_next = gc->inc_modified_next;
} else
gc->inc_repair_next = NULL; gc->inc_repair_next = NULL;
} else { } else {
int live_size; int live_size;
@ -5457,6 +5490,33 @@ static void incremental_repair_pages(NewGC *gc, int fuel)
} }
} }
#if 0
static void check_finished_incremental(NewGC *gc)
{
mpage *work;
int i, ty;
/* Marking all objects, so make all pages writeable and set the scan
boundary on small pages to the beginning of the page. */
for(i = 0; i < PAGE_BIG; i++) {
for(work = gc->gen1_pages[i]; work; work = work->next) {
GC_ASSERT(!work->inc_marked_on || work->non_dead_as_mark);
}
}
for (ty = 0; ty < MED_PAGE_TYPES; ty++) {
for (i = 0; i < NUM_MED_PAGE_SIZES; i++) {
for (work = gc->med_pages[ty][i]; work; work = work->next) {
GC_ASSERT(!work->inc_marked_on || work->non_dead_as_mark);
}
}
}
}
#else
static void check_finished_incremental(NewGC *gc) { }
#endif
static inline void cleanup_vacated_pages(NewGC *gc) { static inline void cleanup_vacated_pages(NewGC *gc) {
mpage *pages = gc->release_pages; mpage *pages = gc->release_pages;
PageMap pagemap = gc->page_maps; PageMap pagemap = gc->page_maps;
@ -5514,6 +5574,15 @@ inline static void gen0_free_big_pages(NewGC *gc) {
gc->gen0.big_pages = NULL; gc->gen0.big_pages = NULL;
} }
static void check_mprotected_for_finished_incremental(NewGC *gc, mpage *work)
{
if (work->mprotected) {
GC_ASSERT(gc->gc_full && gc->finished_incremental);
work->mprotected = 0;
mmu_write_unprotect_page(gc->mmu, work->addr, real_page_size(work), page_mmu_type(work), &work->mmu_src_block);
}
}
static void clean_up_heap(NewGC *gc) static void clean_up_heap(NewGC *gc)
{ {
int i, ty; int i, ty;
@ -5533,6 +5602,7 @@ static void clean_up_heap(NewGC *gc)
if(prev) prev->next = next; else gc->gen1_pages[i] = next; if(prev) prev->next = next; else gc->gen1_pages[i] = next;
if(next) work->next->prev = prev; if(next) work->next->prev = prev;
GCVERBOSEPAGE(gc, "Cleaning up BIGPAGE", work); GCVERBOSEPAGE(gc, "Cleaning up BIGPAGE", work);
check_mprotected_for_finished_incremental(gc, work);
gen1_free_mpage(pagemap, work); gen1_free_mpage(pagemap, work);
--gc->num_gen1_pages; --gc->num_gen1_pages;
} else { } else {
@ -5570,6 +5640,7 @@ static void clean_up_heap(NewGC *gc)
if(prev) prev->next = next; else gc->med_pages[ty][i] = next; if(prev) prev->next = next; else gc->med_pages[ty][i] = next;
if(next) work->next->prev = prev; if(next) work->next->prev = prev;
GCVERBOSEPAGE(gc, "Cleaning up MED NO MARKEDON", work); GCVERBOSEPAGE(gc, "Cleaning up MED NO MARKEDON", work);
check_mprotected_for_finished_incremental(gc, work);
gen1_free_mpage(pagemap, work); gen1_free_mpage(pagemap, work);
--gc->num_gen1_pages; --gc->num_gen1_pages;
} else { } else {
@ -5577,7 +5648,7 @@ static void clean_up_heap(NewGC *gc)
next = NULL; next = NULL;
} }
} }
if (gc->finishing_incremental) { if (gc->all_marked_incremental && !gc->gc_full) {
/* no more allocation on old pages */ /* no more allocation on old pages */
gc->med_freelist_pages[ty][i] = NULL; gc->med_freelist_pages[ty][i] = NULL;
} else } else
@ -5853,16 +5924,24 @@ static int mark_and_finalize_all(NewGC *gc, int old_gen TIME_FORMAL_ARGS)
gc->fnl_gen1 = 1; gc->fnl_gen1 = 1;
} }
if (gc->gc_full)
(void)zero_weak_boxes(gc, 0, 0, 1, -1);
fuel = zero_weak_boxes(gc, 0, 0, old_gen, (old_gen ? fuel : -1)); fuel = zero_weak_boxes(gc, 0, 0, old_gen, (old_gen ? fuel : -1));
if (old_gen && !fuel) { if (old_gen && !fuel) {
gc->fnl_gen1 = 0; gc->fnl_gen1 = 0;
return 1; return 1;
} }
if (gc->gc_full)
(void)zero_weak_arrays(gc, 0, 1, -1);
fuel = zero_weak_arrays(gc, 0, old_gen, (old_gen ? fuel : -1)); fuel = zero_weak_arrays(gc, 0, old_gen, (old_gen ? fuel : -1));
if (old_gen && !fuel) { if (old_gen && !fuel) {
gc->fnl_gen1 = 0; gc->fnl_gen1 = 0;
return 1; return 1;
} }
if (gc->gc_full)
zero_remaining_ephemerons(gc, 1);
zero_remaining_ephemerons(gc, old_gen); zero_remaining_ephemerons(gc, old_gen);
TIME_STEP("zeroed"); TIME_STEP("zeroed");
@ -5872,6 +5951,8 @@ static int mark_and_finalize_all(NewGC *gc, int old_gen TIME_FORMAL_ARGS)
propagate_marks(gc); propagate_marks(gc);
else else
(void)propagate_incremental_marks(gc, 0, -1); (void)propagate_incremental_marks(gc, 0, -1);
if (gc->gc_full)
(void)zero_weak_boxes(gc, 1, 0, 1, -1);
(void)zero_weak_boxes(gc, 1, 0, old_gen, -1); (void)zero_weak_boxes(gc, 1, 0, old_gen, -1);
check_finalizers(gc, 3, old_gen); check_finalizers(gc, 3, old_gen);
@ -5889,6 +5970,21 @@ static int mark_and_finalize_all(NewGC *gc, int old_gen TIME_FORMAL_ARGS)
(void)zero_weak_arrays(gc, 1, old_gen, -1); (void)zero_weak_arrays(gc, 1, old_gen, -1);
zero_remaining_ephemerons(gc, old_gen); zero_remaining_ephemerons(gc, old_gen);
GC_ASSERT(!gc->weak_arrays);
GC_ASSERT(!gc->bp_weak_arrays);
GC_ASSERT(!gc->weak_boxes[0]);
GC_ASSERT(!gc->weak_boxes[1]);
GC_ASSERT(!gc->bp_weak_boxes[0]);
GC_ASSERT(!gc->bp_weak_boxes[1]);
GC_ASSERT(!gc->ephemerons);
GC_ASSERT(!gc->bp_ephemerons);
if (gc->gc_full) {
GC_ASSERT(!gc->inc_weak_arrays);
GC_ASSERT(!gc->inc_weak_boxes[0]);
GC_ASSERT(!gc->inc_weak_boxes[1]);
GC_ASSERT(!gc->inc_ephemerons);
}
if (old_gen) if (old_gen)
gc->fnl_gen1 = 0; gc->fnl_gen1 = 0;
@ -5938,6 +6034,10 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
dump_page_map(gc, "pre"); dump_page_map(gc, "pre");
GC_ASSERT(!gc->all_marked_incremental || gc->started_incremental);
GC_ASSERT(!gc->all_marked_incremental || mark_stack_is_empty(gc->inc_mark_stack));
GC_ASSERT(!gc->finished_incremental || (gc->all_marked_incremental && !gc->inc_repair_next));
/* determine if this should be a full collection or not */ /* determine if this should be a full collection or not */
gc->gc_full = (force_full gc->gc_full = (force_full
|| !gc->generations_available || !gc->generations_available
@ -5947,7 +6047,7 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
fraction of the actual use by live data: */ fraction of the actual use by live data: */
|| (gc->memory_in_use > (FULL_COLLECTION_SIZE_RATIO || (gc->memory_in_use > (FULL_COLLECTION_SIZE_RATIO
* gc->last_full_mem_use * gc->last_full_mem_use
* ((gc->started_incremental && !no_full) * (gc->started_incremental
? INCREMENTAL_EXTRA_SIZE_RATIO ? INCREMENTAL_EXTRA_SIZE_RATIO
: 1))) : 1)))
/* Just in case, for a full GC every so often, unless /* Just in case, for a full GC every so often, unless
@ -5961,10 +6061,7 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
&& !gc->started_incremental) && !gc->started_incremental)
/* In incremental mode, GC earlier if we've done everything /* In incremental mode, GC earlier if we've done everything
that we can do incrementally. */ that we can do incrementally. */
|| (gc->started_incremental || gc->finished_incremental);
&& mark_stack_is_empty(gc->inc_mark_stack)
&& gc->finishing_incremental
&& !gc->inc_repair_next));
if (gc->gc_full && no_full) if (gc->gc_full && no_full)
return; return;
@ -5975,10 +6072,6 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
if (gc->full_needed_for_finalization && gc->gc_full) if (gc->full_needed_for_finalization && gc->gc_full)
gc->full_needed_for_finalization= 0; gc->full_needed_for_finalization= 0;
if (gc->gc_full) {
gc->compact_even_incremental = !gc->finishing_incremental;
gc->finishing_incremental = 0;
}
#ifdef GC_DEBUG_PAGES #ifdef GC_DEBUG_PAGES
if (gc->gc_full == 1) { if (gc->gc_full == 1) {
@ -6020,8 +6113,8 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
gc->incremental_requested = 0; gc->incremental_requested = 0;
gc->mark_gen1 = gc->gc_full || gc->started_incremental; gc->mark_gen1 = (gc->gc_full || gc->started_incremental) && !gc->all_marked_incremental;
gc->check_gen1 = gc->gc_full; gc->check_gen1 = gc->gc_full && !gc->all_marked_incremental;
TIME_INIT(); TIME_INIT();
@ -6038,17 +6131,20 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
else if (gc->mark_gen1) else if (gc->mark_gen1)
incremental_mark_stack_initialize(gc); incremental_mark_stack_initialize(gc);
if (gc->gc_full) if (gc->finished_incremental)
reset_gen1_pages_scan_boundaries(gc); check_finished_incremental(gc);
if (gc->gc_full) if (gc->gc_full && !gc->finished_incremental)
reset_gen1_pages_scan_boundaries_and_writable(gc);
if (gc->gc_full && !gc->finished_incremental)
merge_finalizer_trees(gc); merge_finalizer_trees(gc);
move_gen_half_pages_to_old(gc); move_gen_half_pages_to_old(gc);
init_weak_boxes(gc, gc->gc_full); init_weak_boxes(gc);
init_weak_arrays(gc, gc->gc_full); init_weak_arrays(gc);
init_ephemerons(gc, gc->gc_full); init_ephemerons(gc);
/* at this point, the page map should only include pages that contain /* at this point, the page map should only include pages that contain
collectable objects */ collectable objects */
@ -6076,7 +6172,7 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
(void)mark_and_finalize_all(gc, 0 TIME_ARGS); (void)mark_and_finalize_all(gc, 0 TIME_ARGS);
if (do_incremental) { if (do_incremental) {
if (!gc->finishing_incremental) { if (!gc->all_marked_incremental) {
mark_finalizer_structs(gc, 1); mark_finalizer_structs(gc, 1);
if (!mark_stack_is_empty(gc->inc_mark_stack)) { if (!mark_stack_is_empty(gc->inc_mark_stack)) {
int fuel = (no_full int fuel = (no_full
@ -6094,8 +6190,7 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
BTC_clean_up_gen1(gc); BTC_clean_up_gen1(gc);
reset_gen1_finalizer_tree(gc); reset_gen1_finalizer_tree(gc);
/* Switch to incrementally reparing pages */ /* Switch to incrementally reparing pages */
gc->finishing_incremental = 1; gc->all_marked_incremental = 1;
gc->inc_repair_next = gc->inc_modified_next;
} }
} }
check_inc_repair = 0; check_inc_repair = 0;
@ -6135,11 +6230,14 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
repair_heap(gc); repair_heap(gc);
TIME_STEP("repaired"); TIME_STEP("repaired");
if (check_inc_repair) { if (check_inc_repair) {
GC_ASSERT(gc->all_marked_incremental);
int fuel = (no_full int fuel = (no_full
? INCREMENTAL_REPAIR_FUEL_PER_100M / INCREMENTAL_MINOR_REQUEST_DIVISOR ? INCREMENTAL_REPAIR_FUEL_PER_100M / INCREMENTAL_MINOR_REQUEST_DIVISOR
: INCREMENTAL_REPAIR_FUEL_PER_100M * AS_100M(gc->memory_in_use)); : INCREMENTAL_REPAIR_FUEL_PER_100M * AS_100M(gc->memory_in_use));
incremental_repair_pages(gc, fuel); incremental_repair_pages(gc, fuel);
TIME_STEP("inc-repaired"); TIME_STEP("inc-repaired");
if (!gc->inc_repair_next)
gc->finished_incremental = 1;
} }
clean_up_heap(gc); clean_up_heap(gc);
@ -6224,6 +6322,8 @@ static void garbage_collect(NewGC *gc, int force_full, int no_full, int switchin
if (gc->gc_full) { if (gc->gc_full) {
gc->last_full_mem_use = gc->memory_in_use; gc->last_full_mem_use = gc->memory_in_use;
gc->started_incremental = 0; gc->started_incremental = 0;
gc->all_marked_incremental = 0;
gc->finished_incremental = 0;
gc->inc_prop_count = 0; gc->inc_prop_count = 0;
} }

7
racket/src/racket/gc2/newgc.h
View File

@ -203,23 +203,24 @@ typedef struct NewGC {
unsigned char generations_available :1; unsigned char generations_available :1;
unsigned char started_incremental :1; /* must stick with incremental until major GC */ unsigned char started_incremental :1; /* must stick with incremental until major GC */
unsigned char finishing_incremental :1; /* finalized already */ unsigned char all_marked_incremental :1; /* finished all marking for an incremental GC */
unsigned char finished_incremental :1; /* finished marking and reparing an incremental GC */
unsigned char in_unsafe_allocation_mode :1; unsigned char in_unsafe_allocation_mode :1;
unsigned char full_needed_for_finalization :1; unsigned char full_needed_for_finalization :1;
unsigned char no_further_modifications :1; unsigned char no_further_modifications :1;
unsigned char gc_full :1; /* a flag saying if this is a full/major collection */ unsigned char gc_full :1; /* a flag saying if this is a full/major collection */
unsigned char had_finished_incremental :1; /* when gc_full, indicates full GC after incremental finished */
unsigned char use_gen_half :1; unsigned char use_gen_half :1;
unsigned char running_finalizers :1; unsigned char running_finalizers :1;
unsigned char back_pointers :1; unsigned char back_pointers :1;
unsigned char need_fixup :1; unsigned char need_fixup :1;
unsigned char check_gen1 :1; /* check marks bit for old generation (insteda of claiming always marked) */ unsigned char check_gen1 :1; /* check marks bit for old generation (instead of claiming always marked) */
unsigned char mark_gen1 :1; /* set mark bits for old generation */ unsigned char mark_gen1 :1; /* set mark bits for old generation */
unsigned char inc_gen1 :1; /* during incremental marking of old generation */ unsigned char inc_gen1 :1; /* during incremental marking of old generation */
unsigned char fnl_gen1 :1; /* during incremental finalization of old generation */ unsigned char fnl_gen1 :1; /* during incremental finalization of old generation */
unsigned char during_backpointer :1; unsigned char during_backpointer :1;
unsigned char incremental_requested :1; unsigned char incremental_requested :1;
unsigned char high_fragmentation :1; unsigned char high_fragmentation :1;
unsigned char compact_even_incremental :1;
/* blame the child */ /* blame the child */
unsigned int doing_memory_accounting :1; unsigned int doing_memory_accounting :1;

85
racket/src/racket/gc2/weak.c
View File

@ -132,21 +132,9 @@ void *GC_malloc_weak_array(size_t size_in_bytes, void *replace_val)
return w; return w;
} }
static void rechain_inc_weak_arrays(GC_Weak_Array *w) static void init_weak_arrays(GCTYPE *gc)
{
for (; w; w = (GC_Weak_Array *)w->data[w->count]) {
w->next = (GC_Weak_Array *)w->data[w->count];
}
}
static void init_weak_arrays(GCTYPE *gc, int old_gen)
{ {
GC_ASSERT(!gc->bp_weak_arrays); GC_ASSERT(!gc->bp_weak_arrays);
if (old_gen) {
rechain_inc_weak_arrays(gc->inc_weak_arrays);
gc->weak_arrays = gc->inc_weak_arrays;
gc->inc_weak_arrays = NULL;
} else
gc->weak_arrays = NULL; gc->weak_arrays = NULL;
} }
@ -197,10 +185,15 @@ static int zero_weak_arrays(GCTYPE *gc, int force_zero, int from_inc, int fuel)
if (num_gen0 > 0) { if (num_gen0 > 0) {
if (!is_in_generation_half(gc, wa)) { if (!is_in_generation_half(gc, wa)) {
/* For incremental mode, preserve this weak box if (!gc->all_marked_incremental) {
/* For incremental mode, preserve this weak array
in the incremental list for re-checking later. */ in the incremental list for re-checking later. */
wa->data[wa->count] = gc->inc_weak_arrays; wa->data[wa->count] = gc->inc_weak_arrays;
gc->inc_weak_arrays = wa; gc->inc_weak_arrays = wa;
} else {
/* Count as incremental-done: */
wa->data[wa->count] = gc->weak_incremental_done;
}
} }
} }
@ -330,29 +323,13 @@ void *GC_malloc_weak_box(void *p, void **secondary, int soffset, int is_late)
return w; return w;
} }
static void rechain_inc_weak_boxes(GC_Weak_Box *wb) static void init_weak_boxes(GCTYPE *gc)
{
for (; wb; wb = wb->inc_next) {
wb->next = wb->inc_next;
}
}
static void init_weak_boxes(GCTYPE *gc, int old_gen)
{ {
GC_ASSERT(!gc->bp_weak_boxes[0]); GC_ASSERT(!gc->bp_weak_boxes[0]);
GC_ASSERT(!gc->bp_weak_boxes[1]); GC_ASSERT(!gc->bp_weak_boxes[1]);
if (old_gen) {
rechain_inc_weak_boxes(gc->inc_weak_boxes[0]);
rechain_inc_weak_boxes(gc->inc_weak_boxes[1]);
gc->weak_boxes[0] = gc->inc_weak_boxes[0];
gc->weak_boxes[1] = gc->inc_weak_boxes[1];
gc->inc_weak_boxes[0] = NULL;
gc->inc_weak_boxes[1] = NULL;
} else {
gc->weak_boxes[0] = NULL; gc->weak_boxes[0] = NULL;
gc->weak_boxes[1] = NULL; gc->weak_boxes[1] = NULL;
} }
}
static GC_Weak_Box *append_weak_boxes(GC_Weak_Box *wb, GC_Weak_Box *bp_wb, int *_num_gen0) static GC_Weak_Box *append_weak_boxes(GC_Weak_Box *wb, GC_Weak_Box *bp_wb, int *_num_gen0)
{ {
@ -416,11 +393,16 @@ static int zero_weak_boxes(GCTYPE *gc, int is_late, int force_zero, int from_inc
} }
if (num_gen0 > 0) { if (num_gen0 > 0) {
if (!is_in_generation_half(gc, wb)) { if (!is_in_generation_half(gc, wb)) {
if (!gc->all_marked_incremental) {
/* For incremental mode, preserve this weak box /* For incremental mode, preserve this weak box
in the incremental list for re-checking later. */ in the incremental list for re-checking later. */
check_weak_box_not_already_in_inc_chain(wb, gc->inc_weak_boxes[wb->is_late]); check_weak_box_not_already_in_inc_chain(wb, gc->inc_weak_boxes[wb->is_late]);
wb->inc_next = gc->inc_weak_boxes[is_late]; wb->inc_next = gc->inc_weak_boxes[is_late];
gc->inc_weak_boxes[is_late] = wb; gc->inc_weak_boxes[is_late] = wb;
} else {
/* Count as incremental-done: */
wb->inc_next = gc->weak_incremental_done;
}
} }
} }
if (from_inc) { if (from_inc) {
@ -481,7 +463,7 @@ static int mark_ephemeron(void *p, struct NewGC *gc)
other old-generation objects), so ignore in that case */ other old-generation objects), so ignore in that case */
&& (gc->mark_gen1 && (gc->mark_gen1
|| !gc->started_incremental || !gc->started_incremental
|| !gc->finishing_incremental)) { || !gc->all_marked_incremental)) {
eph->next = gc->bp_ephemerons; eph->next = gc->bp_ephemerons;
gc->bp_ephemerons = eph; gc->bp_ephemerons = eph;
} }
@ -545,19 +527,8 @@ void *GC_malloc_ephemeron(void *k, void *v)
return eph; return eph;
} }
static void rechain_inc_ephemerons(GC_Ephemeron *e) void init_ephemerons(GCTYPE *gc) {
{ GC_ASSERT(!gc->bp_ephemerons);
for (; e; e = e->inc_next) {
e->next = e->inc_next;
}
}
void init_ephemerons(GCTYPE *gc, int old_gen) {
if (old_gen) {
rechain_inc_ephemerons(gc->inc_ephemerons);
gc->ephemerons = gc->inc_ephemerons;
gc->inc_ephemerons = NULL;
} else
gc->ephemerons = NULL; gc->ephemerons = NULL;
gc->bp_ephemerons = NULL; gc->bp_ephemerons = NULL;
gc->num_last_seen_ephemerons = 0; gc->num_last_seen_ephemerons = 0;
@ -570,18 +541,23 @@ static int mark_ready_ephemerons(GCTYPE *gc, int inc_gen1)
GC_mark_no_recur(gc, 1); GC_mark_no_recur(gc, 1);
for (j = 0; j < (inc_gen1 ? 1 : 2); j++) { for (j = 0; j < (inc_gen1 ? 1 : (gc->gc_full ? 3 : 2)); j++) {
waiting = NULL;
if (inc_gen1) if (inc_gen1)
eph = gc->inc_ephemerons; eph = gc->inc_ephemerons;
else if (j == 0) else if (j == 0)
eph = gc->ephemerons; eph = gc->ephemerons;
else else if (j == 1)
eph = gc->bp_ephemerons; eph = gc->bp_ephemerons;
else {
waiting = NULL; eph = gc->inc_ephemerons;
gc->inc_ephemerons = NULL;
waiting = gc->ephemerons;
}
for (; eph; eph = next) { for (; eph; eph = next) {
if (inc_gen1) if (inc_gen1 || (j == 2))
next = eph->inc_next; next = eph->inc_next;
else else
next = eph->next; next = eph->next;
@ -591,9 +567,10 @@ static int mark_ready_ephemerons(GCTYPE *gc, int inc_gen1)
gcMARK2(eph->val, gc); gcMARK2(eph->val, gc);
gc->num_last_seen_ephemerons++; gc->num_last_seen_ephemerons++;
did_one = 1; did_one = 1;
if (!inc_gen1 && (j == 0) && !gc->gc_full && gc->started_incremental) { if (!inc_gen1 && (j == 0) && !gc->gc_full
&& gc->started_incremental && !gc->all_marked_incremental) {
/* Need to preserve the ephemeron in the incremental list, /* Need to preserve the ephemeron in the incremental list,
unless it's kept in generation 1/2 nistead of promoted to unless it's kept in generation 1/2 instead of promoted to
generation 1. */ generation 1. */
if (!is_in_generation_half(gc, eph)) { if (!is_in_generation_half(gc, eph)) {
eph->inc_next = gc->inc_ephemerons; eph->inc_next = gc->inc_ephemerons;
@ -613,7 +590,7 @@ static int mark_ready_ephemerons(GCTYPE *gc, int inc_gen1)
if (inc_gen1) if (inc_gen1)
gc->inc_ephemerons = waiting; gc->inc_ephemerons = waiting;
else if (j == 0) else if ((j == 0)|| (j == 2))
gc->ephemerons = waiting; gc->ephemerons = waiting;
else else
gc->bp_ephemerons = waiting; gc->bp_ephemerons = waiting;
@ -628,6 +605,8 @@ static void zero_remaining_ephemerons(GCTYPE *gc, int from_inc)
{ {
GC_Ephemeron *eph; GC_Ephemeron *eph;
GC_ASSERT(from_inc || !gc->gc_full || !gc->inc_ephemerons);
/* After level-1 finalization, any remaining ephemerons /* After level-1 finalization, any remaining ephemerons
should be zeroed. */ should be zeroed. */
if (from_inc) { if (from_inc) {