mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-19 11:10:25 +02:00
Code Activity

Rework heap marking

Browse source
This commit is contained in:
Andy Wingo 2023-10-02 22:48:59 +02:00
parent d56356fec7
commit 9936d98f70
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/bdw.c
View file

@ -257,11 +257,6 @@ mark_mutator(GC_word *addr, struct GC_ms_entry *mark_stack_ptr,
state.mark_stack_limit, state.mark_stack_limit,
NULL); NULL);
state.mark_stack_ptr = GC_MARK_AND_PUSH (mut->heap,
state.mark_stack_ptr,
state.mark_stack_limit,
NULL);
if (mut->roots) if (mut->roots)
gc_trace_mutator_roots(mut->roots, bdw_mark_edge, mut->heap, &state); gc_trace_mutator_roots(mut->roots, bdw_mark_edge, mut->heap, &state);
@ -322,16 +317,16 @@ gc_heap_pending_ephemerons(struct gc_heap *heap) {
return NULL; return NULL;
} }
struct gc_heap *__the_bdw_gc_heap;
int gc_init(const struct gc_options *options, struct gc_stack_addr *stack_base, int gc_init(const struct gc_options *options, struct gc_stack_addr *stack_base,
struct gc_heap **heap, struct gc_mutator **mutator) { struct gc_heap **heap, struct gc_mutator **mutator) {
// Root the heap, which will also cause all mutators to be marked. // Root the heap, which will also cause all mutators to be marked.
static struct gc_heap *the_heap;
GC_ASSERT_EQ(gc_allocator_small_granule_size(), GC_INLINE_GRANULE_BYTES); GC_ASSERT_EQ(gc_allocator_small_granule_size(), GC_INLINE_GRANULE_BYTES);
GC_ASSERT_EQ(gc_allocator_large_threshold(), GC_ASSERT_EQ(gc_allocator_large_threshold(),
GC_INLINE_FREELIST_COUNT * GC_INLINE_GRANULE_BYTES); GC_INLINE_FREELIST_COUNT * GC_INLINE_GRANULE_BYTES);
GC_ASSERT_EQ(the_heap, NULL); GC_ASSERT_EQ(__the_bdw_gc_heap, NULL);
if (!options) options = gc_allocate_options(); if (!options) options = gc_allocate_options();
@ -394,7 +389,11 @@ int gc_init(const struct gc_options *options, struct gc_stack_addr *stack_base,
pthread_mutex_init(&(*heap)->lock, NULL); pthread_mutex_init(&(*heap)->lock, NULL);
*mutator = add_mutator(*heap); *mutator = add_mutator(*heap);
the_heap = *heap; __the_bdw_gc_heap = *heap;
// Sanity check.
if (!GC_is_visible (&__the_bdw_gc_heap))
abort ();
return 1; return 1;
} }