From 20bb9ce11b4a8281bfe908292e460aab8bd1246a Mon Sep 17 00:00:00 2001 From: Jonas Echterhoff Date: Mon, 18 May 2020 13:21:03 +0200 Subject: [PATCH 1/3] update bdwgc --- external/bdwgc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/bdwgc b/external/bdwgc index 35a51fcbf1e6..0480a661fed6 160000 --- a/external/bdwgc +++ b/external/bdwgc @@ -1 +1 @@ -Subproject commit 35a51fcbf1e64457e46f9655cec7ccc586a13135 +Subproject commit 0480a661fed6149741aeb318f8aa31a96d9182cb From fbfbd131396c36f6d3a1e1cd4af7e494bda3fb80 Mon Sep 17 00:00:00 2001 From: Jonas Echterhoff Date: Tue, 26 May 2020 16:04:20 +0200 Subject: [PATCH 2/3] Expose mono_gc_start_incremental_collection API --- mono/metadata/boehm-gc.c | 7 +++++++ mono/metadata/mono-gc.h | 1 + mono/metadata/null-gc.c | 5 +++++ mono/metadata/sgen-mono.c | 6 ++++++ 4 files changed, 19 insertions(+) diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c index 5515dcf0cb9e..8add35d9196d 100644 --- a/mono/metadata/boehm-gc.c +++ b/mono/metadata/boehm-gc.c @@ -394,6 +394,13 @@ mono_gc_collect_a_little() return GC_collect_a_little(); } +void mono_gc_start_incremental_collection() +{ +#if HAVE_BDWGC_GC + GC_start_incremental_collection(); +#endif +} + /** * mono_gc_max_generation: * diff --git a/mono/metadata/mono-gc.h b/mono/metadata/mono-gc.h index f2ce265ab19d..dbf2971efc20 100644 --- a/mono/metadata/mono-gc.h +++ b/mono/metadata/mono-gc.h @@ -117,6 +117,7 @@ MONO_API MonoBoolean mono_gc_is_incremental (void); MONO_API void mono_gc_set_incremental(MonoBoolean value); MONO_API void mono_gc_finalize_notify (void); MONO_API int mono_gc_invoke_finalizers (void); +MONO_API void mono_gc_start_incremental_collection(); /* heap walking is only valid in the pre-stop-world event callback */ MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data); diff --git a/mono/metadata/null-gc.c b/mono/metadata/null-gc.c index b95ffa4e29d3..7f91ee38c0ad 100644 --- a/mono/metadata/null-gc.c +++ b/mono/metadata/null-gc.c @@ -55,6 +55,11 @@ mono_gc_collect (int generation) { } +void +mono_gc_start_incremental_collection() +{ +} + int mono_gc_max_generation (void) { diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c index 98197c1ca805..2a2f624b1837 100644 --- a/mono/metadata/sgen-mono.c +++ b/mono/metadata/sgen-mono.c @@ -2819,6 +2819,12 @@ mono_gc_collect (int generation) sgen_gc_collect (generation); } +void +mono_gc_start_incremental_collection() +{ + +} + int mono_gc_collection_count (int generation) { From 368385a08147f0c71e8eb2bc6afeb6ff9b3e2068 Mon Sep 17 00:00:00 2001 From: Jonas Echterhoff Date: Tue, 26 May 2020 16:22:32 +0200 Subject: [PATCH 3/3] switch bdwgc repo back to unity-master branch --- external/bdwgc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/bdwgc b/external/bdwgc index 0480a661fed6..876a56777d9f 160000 --- a/external/bdwgc +++ b/external/bdwgc @@ -1 +1 @@ -Subproject commit 0480a661fed6149741aeb318f8aa31a96d9182cb +Subproject commit 876a56777d9fb8ca559c8889c586cc88eb120d75