[mono] Fix Mono's logging profiler build for mobile (#52068)

Enable build of the logging profiler on mobile platforms (Android, iOS and tvOS) Profiler code used a handful of deprecated functions which caused build errors. Replace the functions with local dummy implementations. Build both static and dynamic versions of the logging profiler.
dotnet · Apr 30, 2021 · d2dff5d · d2dff5d
1 parent 6b71dd2
commit d2dff5d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 11 deletions.
diff --git a/src/mono/mono/metadata/jit-info.h b/src/mono/mono/metadata/jit-info.h
@@ -285,7 +285,7 @@ mono_jit_info_get_unwind_info (MonoJitInfo *ji);
 typedef MonoJitInfo *(*MonoJitInfoFindInAot)         (MonoImage *image, gpointer addr);
 void          mono_install_jit_info_find_in_aot (MonoJitInfoFindInAot func);
 
-MonoJitInfo* mono_jit_info_table_find_internal (gpointer addr, gboolean try_aot, gboolean allow_trampolines);
+MONO_PROFILER_API MonoJitInfo* mono_jit_info_table_find_internal (gpointer addr, gboolean try_aot, gboolean allow_trampolines);
 
 typedef void (*MonoJitInfoFunc) (MonoJitInfo *ji, gpointer user_data);
 

diff --git a/src/mono/mono/profiler/CMakeLists.txt b/src/mono/mono/profiler/CMakeLists.txt
@@ -10,6 +10,20 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/../sgen)
 
 if(NOT DISABLE_LIBS)
+  if(HOST_ANDROID OR HOST_IOS OR HOST_TVOS)
+    # Build the logging profiler only for mobile platforms
+    add_library(mono-profiler-log SHARED helper.c log.c log-args.c)
+    target_link_libraries(mono-profiler-log monosgen-shared eglib_objects)
+    if(HOST_ANDROID)
+      target_link_libraries(mono-profiler-log log)
+    endif()
+    install(TARGETS mono-profiler-log LIBRARY)
+
+    add_library(mono-profiler-log-static STATIC helper.c log.c log-args.c)
+    set_target_properties(mono-profiler-log-static PROPERTIES OUTPUT_NAME mono-profiler-log)
+    install(TARGETS mono-profiler-log-static LIBRARY)
+  endif()
+
   add_library(mono-profiler-aot-static STATIC aot.c helper.c)
   set_target_properties(mono-profiler-aot-static PROPERTIES OUTPUT_NAME mono-profiler-aot)
   install(TARGETS mono-profiler-aot-static LIBRARY)

diff --git a/src/mono/mono/profiler/log.c b/src/mono/mono/profiler/log.c
@@ -18,6 +18,7 @@
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/icall-internals.h>
+#include <mono/metadata/jit-info.h>
 #include <mono/metadata/loader.h>
 #include <mono/metadata/loader-internals.h>
 #include <mono/metadata/metadata-internals.h>
@@ -206,6 +207,24 @@ typedef struct {
 #define PROF_TLS_SET(VAL) mono_thread_info_set_tools_data (VAL)
 #define PROF_TLS_GET mono_thread_info_get_tools_data
 
+static int32_t
+domain_get_id (MonoDomain *domain)
+{
+	return 1;
+}
+
+static int32_t
+context_get_id (MonoAppContext *context)
+{
+	return 1;
+}
+
+static int32_t
+context_get_domain_id (MonoAppContext *context)
+{
+	return 1;
+}
+
 static uintptr_t
 thread_id (void)
 {
@@ -1298,10 +1317,10 @@ gc_root_register (MonoProfiler *prof, const mono_byte *start, size_t size, MonoG
 	switch (source) {
 	case MONO_ROOT_SOURCE_DOMAIN:
 		if (key)
-			key = (void *)(uintptr_t) mono_domain_get_id ((MonoDomain *) key);
+			key = (void *)(uintptr_t) domain_get_id ((MonoDomain *) key);
 		break;
 	case MONO_ROOT_SOURCE_CONTEXT_STATIC:
-		key = (void *)(uintptr_t) mono_context_get_id ((MonoAppContext *) key);
+		key = (void *)(uintptr_t) context_get_id ((MonoAppContext *) key);
 		break;
 	default:
 		break;
@@ -1906,7 +1925,7 @@ vtable_loaded (MonoProfiler *prof, MonoVTable *vtable)
 {
 	MonoClass *klass = mono_vtable_class_internal (vtable);
 	MonoDomain *domain = mono_vtable_domain_internal (vtable);
-	uint32_t domain_id = domain ? mono_domain_get_id (domain) : 0;
+	uint32_t domain_id = domain ? domain_get_id (domain) : 0;
 
 	ENTER_LOG (&vtable_loads_ctr, logbuffer,
 		EVENT_SIZE /* event */ +
@@ -2211,7 +2230,7 @@ domain_loaded (MonoProfiler *prof, MonoDomain *domain)
 
 	emit_event (logbuffer, TYPE_END_LOAD | TYPE_METADATA);
 	emit_byte (logbuffer, TYPE_DOMAIN);
-	emit_ptr (logbuffer, (void*)(uintptr_t) mono_domain_get_id (domain));
+	emit_ptr (logbuffer, (void*)(uintptr_t) domain_get_id (domain));
 
 	EXIT_LOG;
 }
@@ -2227,7 +2246,7 @@ domain_unloaded (MonoProfiler *prof, MonoDomain *domain)
 
 	emit_event (logbuffer, TYPE_END_UNLOAD | TYPE_METADATA);
 	emit_byte (logbuffer, TYPE_DOMAIN);
-	emit_ptr (logbuffer, (void*)(uintptr_t) mono_domain_get_id (domain));
+	emit_ptr (logbuffer, (void*)(uintptr_t) domain_get_id (domain));
 
 	EXIT_LOG;
 }
@@ -2246,7 +2265,7 @@ domain_name (MonoProfiler *prof, MonoDomain *domain, const char *name)
 
 	emit_event (logbuffer, TYPE_METADATA);
 	emit_byte (logbuffer, TYPE_DOMAIN);
-	emit_ptr (logbuffer, (void*)(uintptr_t) mono_domain_get_id (domain));
+	emit_ptr (logbuffer, (void*)(uintptr_t) domain_get_id (domain));
 	memcpy (logbuffer->cursor, name, nlen);
 	logbuffer->cursor += nlen;
 
@@ -2265,8 +2284,8 @@ context_loaded (MonoProfiler *prof, MonoAppContext *context)
 
 	emit_event (logbuffer, TYPE_END_LOAD | TYPE_METADATA);
 	emit_byte (logbuffer, TYPE_CONTEXT);
-	emit_ptr (logbuffer, (void*)(uintptr_t) mono_context_get_id (context));
-	emit_ptr (logbuffer, (void*)(uintptr_t) mono_context_get_domain_id (context));
+	emit_ptr (logbuffer, (void*)(uintptr_t) context_get_id (context));
+	emit_ptr (logbuffer, (void*)(uintptr_t) context_get_domain_id (context));
 
 	EXIT_LOG;
 }
@@ -2283,8 +2302,8 @@ context_unloaded (MonoProfiler *prof, MonoAppContext *context)
 
 	emit_event (logbuffer, TYPE_END_UNLOAD | TYPE_METADATA);
 	emit_byte (logbuffer, TYPE_CONTEXT);
-	emit_ptr (logbuffer, (void*)(uintptr_t) mono_context_get_id (context));
-	emit_ptr (logbuffer, (void*)(uintptr_t) mono_context_get_domain_id (context));
+	emit_ptr (logbuffer, (void*)(uintptr_t) context_get_id (context));
+	emit_ptr (logbuffer, (void*)(uintptr_t) context_get_domain_id (context));
 
 	EXIT_LOG;
 }