What if everything was managed-only?

Author: jonathanpeppers

src/Mono.Android.Runtime/Mono.Android.Runtime.csproj

@@ -64,6 +64,5 @@
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop\Java.Interop.csproj" />
   </ItemGroup>
 
-  <Import Project="..\..\build-tools\scripts\custom-runtime.targets" />
   <Import Project="Mono.Android.Runtime.targets" />
 </Project>

src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Java;
 using System.Text;
 
 namespace Android.Runtime
@@ -19,7 +18,7 @@ enum TraceKind : uint
 		All     = Java | Managed | Native | Signals,
 	}
 
-	internal unsafe static class RuntimeNativeMethods
+	internal static class RuntimeNativeMethods
 	{
 		[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
 		internal extern static void monodroid_log (LogLevel level, LogCategories category, string message);
@@ -93,17 +92,6 @@ internal unsafe static class RuntimeNativeMethods
 		[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
 		internal static extern bool clr_typemap_java_to_managed (string java_type_name, out IntPtr managed_assembly_name, out uint managed_type_token_id);
 
-		/// <summary>
-		/// TODO: implement this in the native side.
-		/// Initializes the "GC Bridge" implementation for the CoreCLR runtime.
-		/// </summary>
-		/// <param name="bridge_processing_finished_callback">A function pointer to a C# callback that will be invoked when bridge processing has completed.</param>
-		/// <returns>A function pointer that should be passed to JavaMarshal.Initialize() on startup.</returns>
-		[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-		internal static extern delegate* unmanaged<nint, StronglyConnectedComponent*, nint, ComponentCrossReference*, void> clr_initialize_gc_bridge (
-			delegate* unmanaged<nint, StronglyConnectedComponent*, nint, ComponentCrossReference*, void> bridge_processing_finished_callback
-		);
-
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		internal static extern void monodroid_unhandled_exception (Exception javaException);
 

src/Mono.Android/Microsoft.Android.Runtime/ManagedValueManager.cs

@@ -25,8 +25,7 @@ class ManagedValueManager : JniRuntime.JniValueManager
 
 	internal unsafe ManagedValueManager ()
 	{
-		var mark_cross_references_ftn = RuntimeNativeMethods.clr_initialize_gc_bridge (&BridgeProcessingFinished);
-		JavaMarshal.Initialize (mark_cross_references_ftn);
+		JavaMarshal.Initialize (&FinishBridgeProcessing);
 	}
 
 	public override void WaitForGCBridgeProcessing ()
@@ -277,8 +276,10 @@ static unsafe void FreeHandle (GCHandle handle)
 	}
 
 	[UnmanagedCallersOnly]
-	internal static unsafe void BridgeProcessingFinished (nint sccsLen, StronglyConnectedComponent* sccs, nint ccrsLen, ComponentCrossReference* ccrs)
+	internal static unsafe void FinishBridgeProcessing (nint sccsLen, StronglyConnectedComponent* sccs, nint ccrsLen, ComponentCrossReference* ccrs)
 	{
+		Java.Lang.JavaSystem.Gc ();
+
 		JavaMarshal.ReleaseMarkCrossReferenceResources (
 			new Span<StronglyConnectedComponent> (sccs, (int) sccsLen),
 			new Span<ComponentCrossReference> (ccrs, (int) ccrsLen));

src/native/clr/host/generate-pinvoke-tables.cc

@@ -72,7 +72,6 @@ const std::vector<std::string> internal_pinvoke_names = {
 	"monodroid_TypeManager_get_java_class_name",
 	"clr_typemap_managed_to_java",
 	"clr_typemap_java_to_managed",
-	"clr_initialize_gc_bridge",
 	"_monodroid_weak_gref_delete",
 	"_monodroid_weak_gref_get",
 	"_monodroid_weak_gref_new",

src/native/clr/host/internal-pinvokes.cc

@@ -36,16 +36,6 @@ bool clr_typemap_java_to_managed (const char *java_type_name, char const** assem
 	return TypeMapper::typemap_java_to_managed (java_type_name, assembly_name, managed_type_token_id);
 }
 
-static void clr_mark_cross_references (size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)
-{
-	// TODO: implement this
-}
-
-MarkCrossReferencesFtn clr_initialize_gc_bridge (MarkCrossReferencesFtn callback) noexcept
-{
-	return clr_mark_cross_references;
-}
-
 void monodroid_log (LogLevel level, LogCategories category, const char *message) noexcept
 {
 	switch (level) {

src/native/clr/include/runtime-base/internal-pinvokes.hh

@@ -7,28 +7,13 @@
 #include "logger.hh"
 #include <runtime-base/timing.hh>
 
-struct StronglyConnectedComponent
-{
-    size_t Count;
-    void** ContextMemory;
-};
-
-struct ComponentCrossReference
-{
-    size_t SourceGroupIndex;
-    size_t DestinationGroupIndex;
-};
-
-typedef void (*MarkCrossReferencesFtn)(size_t, StronglyConnectedComponent*, size_t, ComponentCrossReference*);
-
 extern "C" {
 	int _monodroid_gref_get () noexcept;
 	void _monodroid_gref_log (const char *message) noexcept;
 	int _monodroid_gref_log_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable) noexcept;
 	void _monodroid_gref_log_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable) noexcept;
 	const char* clr_typemap_managed_to_java (const char *typeName, const uint8_t *mvid) noexcept;
 	bool clr_typemap_java_to_managed (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept;
-	MarkCrossReferencesFtn clr_initialize_gc_bridge (MarkCrossReferencesFtn callback) noexcept;
 	void monodroid_log (xamarin::android::LogLevel level, LogCategories category, const char *message) noexcept;
 	char* monodroid_TypeManager_get_java_class_name (jclass klass) noexcept;
 	void monodroid_free (void *ptr) noexcept;