mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-06 09:30:29 +02:00
Code Activity

Merge remote-tracking branch 'whippet/main' into wip-whippet

Browse source
This commit is contained in:
Andy Wingo 2025-07-04 10:29:52 +02:00
commit 1ef26268ba
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libguile/whippet/src/mmc.c
View file

@ -622,6 +622,9 @@ grow_heap_if_necessary(struct gc_heap *heap,
: 0; : 0;
size_t headroom = nofl_empty_block_count(nofl) * NOFL_BLOCK_SIZE; size_t headroom = nofl_empty_block_count(nofl) * NOFL_BLOCK_SIZE;
headroom += nofl_space_evacuation_reserve_bytes(nofl);
needed_headroom += nofl_space_evacuation_minimum_reserve_bytes(nofl);
if (headroom < needed_headroom + pending) if (headroom < needed_headroom + pending)
resize_heap(heap, heap->size - headroom + needed_headroom + pending); resize_heap(heap, heap->size - headroom + needed_headroom + pending);
} }

23
libguile/whippet/src/nofl-space.h
View file

@ -561,11 +561,16 @@ nofl_active_block_count(struct nofl_space *space) {
return total - unavailable; return total - unavailable;
} }
static size_t
nofl_evacuation_block_count(struct nofl_space *space) {
return nofl_block_count(&space->evacuation_targets);
}
static int static int
nofl_maybe_push_evacuation_target(struct nofl_space *space, nofl_maybe_push_evacuation_target(struct nofl_space *space,
struct nofl_block_ref block, struct nofl_block_ref block,
double reserve) { double reserve) {
size_t targets = nofl_block_count(&space->evacuation_targets); size_t targets = nofl_evacuation_block_count(space);
size_t active = nofl_active_block_count(space); size_t active = nofl_active_block_count(space);
if (targets >= ceil(active * reserve)) if (targets >= ceil(active * reserve))
return 0; return 0;
@ -914,6 +919,7 @@ nofl_allocator_next_hole(struct nofl_allocator *alloc,
break; break;
if (min_granules <= granules) if (min_granules <= granules)
return granules; return granules;
nofl_allocator_finish_hole(alloc);
nofl_allocator_release_full_block(alloc, space); nofl_allocator_release_full_block(alloc, space);
} }
@ -1181,7 +1187,14 @@ nofl_space_estimate_live_bytes_after_gc(struct nofl_space *space,
static size_t static size_t
nofl_space_evacuation_reserve_bytes(struct nofl_space *space) { nofl_space_evacuation_reserve_bytes(struct nofl_space *space) {
return nofl_block_count(&space->evacuation_targets) * NOFL_BLOCK_SIZE; return nofl_evacuation_block_count(space) * NOFL_BLOCK_SIZE;
}
static size_t
nofl_space_evacuation_minimum_reserve_bytes(struct nofl_space *space) {
return
ceil(space->evacuation_minimum_reserve * nofl_active_block_count(space))
* NOFL_BLOCK_SIZE;
} }
static size_t static size_t
@ -1320,7 +1333,7 @@ nofl_space_finish_evacuation(struct nofl_space *space,
space->evacuating = 0; space->evacuating = 0;
size_t active = nofl_active_block_count(space); size_t active = nofl_active_block_count(space);
size_t reserve = ceil(space->evacuation_minimum_reserve * active); size_t reserve = ceil(space->evacuation_minimum_reserve * active);
GC_ASSERT(nofl_block_count(&space->evacuation_targets) == 0); GC_ASSERT(nofl_evacuation_block_count(space) == 0);
while (reserve--) { while (reserve--) {
struct nofl_block_ref block = nofl_pop_empty_block_with_lock(space, lock); struct nofl_block_ref block = nofl_pop_empty_block_with_lock(space, lock);
if (nofl_block_is_null(block)) break; if (nofl_block_is_null(block)) break;
@ -1532,7 +1545,7 @@ nofl_space_finish_gc(struct nofl_space *space,
// for allocation by the mutator. // for allocation by the mutator.
size_t active = nofl_active_block_count(space); size_t active = nofl_active_block_count(space);
size_t target = ceil(space->evacuation_minimum_reserve * active); size_t target = ceil(space->evacuation_minimum_reserve * active);
size_t reserve = nofl_block_count(&space->evacuation_targets); size_t reserve = nofl_evacuation_block_count(space);
while (reserve-- > target) while (reserve-- > target)
nofl_push_empty_block(space, nofl_push_empty_block(space,
nofl_block_list_pop(&space->evacuation_targets), nofl_block_list_pop(&space->evacuation_targets),
@ -1994,7 +2007,7 @@ nofl_space_shrink(struct nofl_space *space, size_t bytes) {
if (pending > 0) { if (pending > 0) {
size_t active = nofl_active_block_count(space); size_t active = nofl_active_block_count(space);
size_t target = ceil(space->evacuation_minimum_reserve * active); size_t target = ceil(space->evacuation_minimum_reserve * active);
ssize_t avail = nofl_block_count(&space->evacuation_targets); ssize_t avail = nofl_evacuation_block_count(space);
while (avail-- > target && pending > 0) { while (avail-- > target && pending > 0) {
struct nofl_block_ref block = struct nofl_block_ref block =
nofl_block_list_pop(&space->evacuation_targets); nofl_block_list_pop(&space->evacuation_targets);