laria/apfl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gc: Prevent recursive garbage collection

Browse source
This commit is contained in:
Laria 2022-07-14 22:08:50 +02:00
parent 1a41df2389
commit 7e592cdb96
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gc.c
View file

@ -43,7 +43,7 @@ gc_allocator(void *opaque, void *oldptr, size_t oldsize, size_t newsize)
struct gc *gc = opaque;
void *out = ALLOCATOR_CALL(gc->base_allocator, oldptr, oldsize, newsize);
if (newsize != 0 && out == NULL) {
if (newsize != 0 && out == NULL && !gc->is_collecting) {
// We're out of memory! Try to get out of this situation by doing a full
// GC run.
apfl_gc_full(gc);
@ -87,6 +87,7 @@ apfl_gc_init(struct gc *gc, struct apfl_allocator allocator, gc_roots_getter roo
.cap = 0,
};
gc->tmproot_for_adding = NULL;
gc->is_collecting = false;
}
static struct gc_block *
@ -373,12 +374,17 @@ sweep(struct gc *gc)
void
apfl_gc_full(struct gc *gc)
{
assert(!gc->is_collecting);
gc->is_collecting = true;
mark_roots(gc);
apfl_gc_debug_dump_graph(gc, stderr);
trace_while_having_grey(gc);
apfl_gc_debug_dump_graph(gc, stderr);
sweep(gc);
apfl_gc_debug_dump_graph(gc, stderr);
gc->is_collecting = false;
}
static const char *

2
src/gc.h
View file

@ -50,6 +50,8 @@ struct gc {
void *roots_getter_opaque;
struct gc_tmproots tmproots;
struct gc_object *tmproot_for_adding;
bool is_collecting;
};