Basic functionality working.

Author: joncham

mono/metadata/boehm-gc.c

@@ -2194,10 +2194,37 @@ mono_clear_ephemerons (void)
 	}
 }
 
+LateHandleCallback s_late_handle_callback;
+void* s_late_handle_callback_user_data;
+
+void
+mono_gchandle_set_late_callback(LateHandleCallback late_handle_callback, void* user_data)
+{
+	s_late_handle_callback = late_handle_callback;
+	s_late_handle_callback_user_data = user_data;
+
+}
+
+typedef struct {
+	struct GC_ms_entry* mark_stack_ptr;
+	struct GC_ms_entry* mark_stack_limit;
+} MarkHandleData;
+
+MarkHandleData* s_mark_data;
+
+
+void mono_gchandle_mark_object(MonoObject* obj)
+{
+	g_assert(s_mark_data);
+	s_mark_data->mark_stack_ptr = GC_mark_and_push(obj, s_mark_data->mark_stack_ptr, s_mark_data->mark_stack_limit, NULL);
+}
+
 static struct GC_ms_entry*
 mono_push_ephemerons (struct GC_ms_entry* mark_stack_ptr, struct GC_ms_entry* mark_stack_limit)
 {
+	struct GC_ms_entry* mark_stack_ptr_orig = mark_stack_ptr;
 	/* push late GC handles */
+	if (s_late_handle_callback)
 	{
 		GHashTableIter iter;
 		g_hash_table_iter_init(&iter, late_handles);
@@ -2217,14 +2244,42 @@ mono_push_ephemerons (struct GC_ms_entry* mark_stack_ptr, struct GC_ms_entry* ma
 				MonoObject* object = *handle;
 
 				if (GC_is_marked(object)) {
-					continue;
+					MarkHandleData data;
+					data.mark_stack_ptr = mark_stack_ptr;
+					data.mark_stack_limit = mark_stack_limit;
+					s_mark_data = &data;
+					// optimize, only process newly marked object
+					s_late_handle_callback(object, s_late_handle_callback_user_data);
+					mark_stack_ptr = data.mark_stack_ptr;
+					s_mark_data = NULL;
 				}
-				else {
+			}
+		}
+	}
 
-					mark_stack_ptr = GC_mark_and_push(object, mark_stack_ptr, mark_stack_limit, handle);
-				}
+	// mark all handles, as we want to keep all targets alive like a strong handle
+	if (mark_stack_ptr_orig == mark_stack_ptr)
+	{
+		GHashTableIter iter;
+		g_hash_table_iter_init(&iter, late_handles);
+
+		gpointer key;
+		gpointer value;
+
+		while (g_hash_table_iter_next(&iter, &key, &value)) {
+			/* process handles */
+			gpointer* handles = key;
+			size_t length = (size_t)value;
+			for (size_t i = 0; i < length; ++i) {
+				MonoObject** handle = handles + i;
+				if (!*handle)
+					continue;
+
+				MonoObject* object = *handle;
+				mark_stack_ptr = GC_mark_and_push(object, mark_stack_ptr, mark_stack_limit, handle);
 			}
 		}
+		s_late_handle_callback = NULL;
 	}
 
 

mono/metadata/object.h

@@ -381,6 +381,12 @@ MONO_API MONO_RT_EXTERNAL_ONLY MonoGCHandle mono_gchandle_new_weakref_v2 (MonoOb
 MONO_API MONO_RT_EXTERNAL_ONLY MonoObject*  mono_gchandle_get_target_v2  (MonoGCHandle gchandle);
 MONO_API MONO_RT_EXTERNAL_ONLY void         mono_gchandle_free_v2        (MonoGCHandle gchandle);
 
+
+typedef void (*DoUnityProcessing)(void* handle);
+typedef void (*LateHandleCallback)(MonoObject* obj, void* user_data);
+MONO_API MONO_RT_EXTERNAL_ONLY void mono_gchandle_set_late_callback(LateHandleCallback late_handle_callback, void* user_data);
+MONO_API MONO_RT_EXTERNAL_ONLY void mono_gchandle_mark_object(MonoObject* obj);
+
 /* make sure the gchandle was allocated for an object in domain */
 UNITY_MONO_API MONO_RT_EXTERNAL_ONLY mono_bool mono_gchandle_is_in_domain_v2 (MonoGCHandle gchandle, MonoDomain* domain);