Skip to content

add in_minor_collection and port #1743 (Add some checks that the minor GC does not recurse) #2075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 23, 2023
Merged

add in_minor_collection and port #1743 (Add some checks that the minor GC does not recurse) #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58a60b7
add in_minor_collection and port #1743
riaqn Nov 23, 2023
32ba7ab
initialize in_minor_collection
riaqn Nov 23, 2023
fdcb41b
add macro as suggested
riaqn Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ocaml/otherlibs/systhreads/st_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ static void caml_thread_scan_roots(

static void save_runtime_state(void)
{
if (Caml_state->in_minor_collection)
caml_fatal_error("Thread switch from inside minor GC");
CAMLassert(This_thread != NULL);
caml_thread_t this_thread = This_thread;
this_thread->current_stack = Caml_state->current_stack;
Expand Down
2 changes: 2 additions & 0 deletions ocaml/runtime/caml/domain_state.tbl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ DOMAIN_STATE(int, parser_trace)

DOMAIN_STATE(asize_t, minor_heap_wsz)

DOMAIN_STATE(intnat, in_minor_collection)

DOMAIN_STATE(struct caml_heap_state*, shared_heap)

DOMAIN_STATE(int, id)
Expand Down
1 change: 1 addition & 0 deletions ocaml/runtime/caml/minor_gc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#define caml_young_alloc_start Caml_state->young_start
#define caml_young_alloc_end Caml_state->young_end
#define caml_minor_heap_wsz Caml_state->minor_heap_wsz
#define caml_in_minor_collection Caml_state->in_minor_collection


#define CAML_TABLE_STRUCT(t) { \
Expand Down
2 changes: 2 additions & 0 deletions ocaml/runtime/domain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,8 @@ static void domain_create(uintnat initial_minor_heap_wsize) {
goto reallocate_minor_heap_failure;
}

domain_state->in_minor_collection = 0;

domain_state->dls_root = Val_unit;
caml_register_generational_global_root(&domain_state->dls_root);

Expand Down
4 changes: 4 additions & 0 deletions ocaml/runtime/minor_gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,9 @@ void caml_empty_minor_heap_promote(caml_domain_state* domain,
caml_gc_log ("Minor collection of domain %d starting", domain->id);
CAML_EV_BEGIN(EV_MINOR);
call_timing_hook(&caml_minor_gc_begin_hook);
if (Caml_state->in_minor_collection)
caml_fatal_error("Minor GC triggered recursively");
Caml_state->in_minor_collection = 1;

if( participating[0] == Caml_state ) {
CAML_EV_BEGIN(EV_MINOR_GLOBAL_ROOTS);
Expand Down Expand Up @@ -639,6 +642,7 @@ void caml_empty_minor_heap_promote(caml_domain_state* domain,
domain->stat_minor_words += Wsize_bsize (minor_allocated_bytes);
domain->stat_promoted_words += domain->allocated_words - prev_alloc_words;

Caml_state->in_minor_collection = 0;
call_timing_hook(&caml_minor_gc_end_hook);
CAML_EV_COUNTER(EV_C_MINOR_PROMOTED,
Bsize_wsize(domain->allocated_words - prev_alloc_words));
Expand Down