Address native logging API feedback

simonrozsival · Copilot · simonrozsival · commit 6a4feea3a84d · 2026-05-27T18:12:26.000+02:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/native/clr/host/bridge-processing.cc b/src/native/clr/host/bridge-processing.cc
@@ -359,31 +359,31 @@ void CrossReferenceTarget::mark_refs_added_if_needed () noexcept
 [[gnu::always_inline]]
 void BridgeProcessingShared::log_missing_add_references_method ([[maybe_unused]] jclass java_class) noexcept
 {
-	(xamarin::android::log_error) (LOG_DEFAULT, "Failed to find monodroidAddReferences method");
+	(log_error) (LOG_DEFAULT, "Failed to find monodroidAddReferences method");
 #if DEBUG
 	abort_if_invalid_pointer_argument (java_class, "java_class");
 	if (!Logger::gc_spew_enabled ()) [[likely]] {
 		return;
 	}
 
 	char *class_name = Host::get_java_class_name_for_TypeManager (java_class);
-	xamarin::android::log_error_fmt (LOG_GC, "Missing monodroidAddReferences method for object of class %s", optional_string (class_name));
+	(log_error) (LOG_GC, "Missing monodroidAddReferences method for object of class %s", optional_string (class_name));
 	free (class_name);
 #endif
 }
 
 [[gnu::always_inline]]
 void BridgeProcessingShared::log_missing_clear_references_method ([[maybe_unused]] jclass java_class) noexcept
 {
-	(xamarin::android::log_error) (LOG_DEFAULT, "Failed to find monodroidClearReferences method");
+	(log_error) (LOG_DEFAULT, "Failed to find monodroidClearReferences method");
 #if DEBUG
 	abort_if_invalid_pointer_argument (java_class, "java_class");
 	if (!Logger::gc_spew_enabled ()) [[likely]] {
 		return;
 	}
 
 	char *class_name = Host::get_java_class_name_for_TypeManager (java_class);
-	xamarin::android::log_error_fmt (LOG_GC, "Missing monodroidClearReferences method for object of class %s", optional_string (class_name));
+	(log_error) (LOG_GC, "Missing monodroidClearReferences method for object of class %s", optional_string (class_name));
 	free (class_name);
 #endif
 }
@@ -487,5 +487,5 @@ void BridgeProcessingShared::log_gc_summary () noexcept
 		}
 	}
 
-	xamarin::android::log_info_fmt (LOG_GC, "GC cleanup summary: %zu objects tested - resurrecting %zu.", total, alive);
+	log_info_fmt (LOG_GC, "GC cleanup summary: %zu objects tested - resurrecting %zu.", total, alive);
 }
diff --git a/src/native/clr/host/fastdev-assemblies.cc b/src/native/clr/host/fastdev-assemblies.cc
@@ -18,9 +18,9 @@ auto FastDevAssemblies::open_assembly (std::string_view const& name, int64_t &si
 {
 	size = 0;
 
-	std::string const& override_dir_path = AndroidSystem::get_primary_override_dir ();
+	const char *override_dir_path = AndroidSystem::get_primary_override_dir ();
 	if (!Util::dir_exists (override_dir_path)) [[unlikely]] {
-		log_debug (LOG_ASSEMBLY, "Override directory '{}' does not exist"sv, override_dir_path);
+		log_debug (LOG_ASSEMBLY, "Override directory '{}' does not exist"sv, optional_string (override_dir_path));
 		return nullptr;
 	}
 
@@ -29,9 +29,9 @@ auto FastDevAssemblies::open_assembly (std::string_view const& name, int64_t &si
 	if (override_dir_fd < 0) [[unlikely]] {
 		std::lock_guard dir_lock { override_dir_lock };
 		if (override_dir_fd < 0) [[likely]] {
-			override_dir = opendir (override_dir_path.c_str ());
+			override_dir = opendir (override_dir_path);
 			if (override_dir == nullptr) [[unlikely]] {
-				log_warn (LOG_ASSEMBLY, "Failed to open override dir '{}'. {}"sv, override_dir_path, strerror (errno));
+				log_warn (LOG_ASSEMBLY, "Failed to open override dir '{}'. {}"sv, optional_string (override_dir_path), strerror (errno));
 				return nullptr;
 			}
 			override_dir_fd = dirfd (override_dir);
@@ -42,7 +42,7 @@ auto FastDevAssemblies::open_assembly (std::string_view const& name, int64_t &si
 		LOG_ASSEMBLY,
 		"Attempting to load FastDev assembly '{}' from override directory '{}'"sv,
 		name,
-		override_dir_path
+		optional_string (override_dir_path)
 	);
 
 	if (!Util::file_exists (override_dir_fd, name)) {
diff --git a/src/native/clr/host/gc-bridge.cc b/src/native/clr/host/gc-bridge.cc
@@ -49,7 +49,7 @@ void GCBridge::trigger_java_gc (JNIEnv *env) noexcept
 
 	env->ExceptionDescribe ();
 	env->ExceptionClear ();
-	(xamarin::android::log_error) (LOG_DEFAULT, "Java GC failed");
+	(log_error) (LOG_DEFAULT, "Java GC failed");
 }
 
 void GCBridge::mark_cross_references (MarkCrossReferencesArgs *args) noexcept
@@ -101,13 +101,13 @@ void GCBridge::log_mark_cross_references_args_if_enabled (MarkCrossReferencesArg
 		return;
 	}
 
-	xamarin::android::log_info_fmt (LOG_GC, "cross references callback invoked with %zu sccs and %zu xrefs.", args->ComponentCount, args->CrossReferenceCount);
+	log_info_fmt (LOG_GC, "cross references callback invoked with %zu sccs and %zu xrefs.", args->ComponentCount, args->CrossReferenceCount);
 
 	JNIEnv *env = OSBridge::ensure_jnienv ();
 	
 	for (size_t i = 0; i < args->ComponentCount; ++i) {
 		const StronglyConnectedComponent &scc = args->Components [i];
-		xamarin::android::log_info_fmt (LOG_GC, "group %zu with %zu objects", i, scc.Count);
+		log_info_fmt (LOG_GC, "group %zu with %zu objects", i, scc.Count);
 		for (size_t j = 0; j < scc.Count; ++j) {
 			log_handle_context (env, scc.Contexts [j]);
 		}
@@ -120,7 +120,7 @@ void GCBridge::log_mark_cross_references_args_if_enabled (MarkCrossReferencesArg
 	for (size_t i = 0; i < args->CrossReferenceCount; ++i) {
 		size_t source_index = args->CrossReferences [i].SourceGroupIndex;
 		size_t dest_index = args->CrossReferences [i].DestinationGroupIndex;
-		xamarin::android::log_info_fmt (LOG_GC, "xref [%zu] %zu -> %zu", i, source_index, dest_index);
+		log_info_fmt (LOG_GC, "xref [%zu] %zu -> %zu", i, source_index, dest_index);
 	}
 }
 
@@ -134,9 +134,9 @@ void GCBridge::log_handle_context (JNIEnv *env, HandleContext *ctx) noexcept
 	jclass java_class = env->GetObjectClass (handle);
 	if (java_class != nullptr) {
 		char *class_name = Host::get_java_class_name_for_TypeManager (java_class);
-		xamarin::android::log_info_fmt (LOG_GC, "gref %p [%s]", reinterpret_cast<void*>(handle), optional_string (class_name));
+		log_info_fmt (LOG_GC, "gref %p [%s]", reinterpret_cast<void*>(handle), optional_string (class_name));
 		free (class_name);
 	} else {
-		xamarin::android::log_info_fmt (LOG_GC, "gref %p [unknown class]", reinterpret_cast<void*>(handle));
+		log_info_fmt (LOG_GC, "gref %p [unknown class]", reinterpret_cast<void*>(handle));
 	}
 }
diff --git a/src/native/clr/include/runtime-base/android-system.hh b/src/native/clr/include/runtime-base/android-system.hh
@@ -63,25 +63,14 @@ namespace xamarin::android {
 			running_in_emulator = yesno;
 		}
 
-#if defined(XA_HOST_NATIVEAOT)
 		static auto get_primary_override_dir () noexcept -> const char*
 		{
 			return primary_override_dir;
 		}
-#else
-		static auto get_primary_override_dir () noexcept -> std::string const&
-		{
-			return primary_override_dir;
-		}
-#endif
 
 		static void set_primary_override_dir (jstring_wrapper& home) noexcept
 		{
-#if defined(XA_HOST_NATIVEAOT)
 			determine_primary_override_dir (home, primary_override_dir, sizeof (primary_override_dir));
-#else
-			primary_override_dir = determine_primary_override_dir (home);
-#endif
 		}
 
 #if !defined(XA_HOST_NATIVEAOT)
@@ -90,7 +79,7 @@ namespace xamarin::android {
 			return native_libraries_dir;
 		}
 
-		static void create_update_dir (std::string const& override_dir) noexcept
+		static void create_update_dir (const char *override_dir) noexcept
 		{
 			if constexpr (Constants::is_release_build) {
 				/*
@@ -106,7 +95,7 @@ namespace xamarin::android {
 				}
 			}
 
-			log_debug (LOG_DEFAULT, "Creating public update directory: `{}`", override_dir);
+			log_debug (LOG_DEFAULT, "Creating public update directory: `{}`", optional_string (override_dir));
 			Util::create_public_directory (override_dir);
 		}
 #endif
@@ -145,7 +134,6 @@ namespace xamarin::android {
 			embedded_dso_mode_enabled = yesno;
 		}
 
-#if defined(XA_HOST_NATIVEAOT)
 		static void determine_primary_override_dir (jstring_wrapper &home, char *buffer, size_t buffer_size) noexcept
 		{
 			dynamic_local_string<SENSIBLE_PATH_MAX> name { home.get_cstr () };
@@ -156,27 +144,13 @@ namespace xamarin::android {
 
 			snprintf (buffer, buffer_size, "%s", name.get ());
 		}
-#else
-		static auto determine_primary_override_dir (jstring_wrapper &home) noexcept -> std::string
-		{
-			dynamic_local_string<SENSIBLE_PATH_MAX> name { home.get_cstr () };
-			name.append ("/")
-				.append (Constants::OVERRIDE_DIRECTORY_NAME)
-				.append ("/")
-				.append (Constants::android_lib_abi);
-
-			return {name.get (), name.length ()};
-		}
-#endif
 
 	private:
 		static inline long max_gref_count = 0;
 		static inline bool running_in_emulator = false;
 		static inline bool embedded_dso_mode_enabled = false;
-#if defined(XA_HOST_NATIVEAOT)
 		static inline char primary_override_dir[SENSIBLE_PATH_MAX] {};
-#else
-		static inline std::string primary_override_dir;
+#if !defined(XA_HOST_NATIVEAOT)
 		static inline std::string native_libraries_dir;
 
 #if defined (DEBUG)
diff --git a/src/native/clr/include/shared/log_types.hh b/src/native/clr/include/shared/log_types.hh
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdarg>
 #include <cstdint>
 #if !defined(XA_HOST_NATIVEAOT)
 #include <format>
@@ -69,36 +70,6 @@ namespace xamarin::android {
 		log_write (category, level, message.data ());
 	}
 
-	[[gnu::always_inline]]
-	static inline void (log_debug) (LogCategories category, const char *message) noexcept
-	{
-		log_write (category, LogLevel::Debug, message);
-	}
-
-	[[gnu::always_inline]]
-	static inline void (log_info) (LogCategories category, const char *message) noexcept
-	{
-		log_write (category, LogLevel::Info, message);
-	}
-
-	[[gnu::always_inline]]
-	static inline void (log_warn) (LogCategories category, const char *message) noexcept
-	{
-		log_write (category, LogLevel::Warn, message);
-	}
-
-	[[gnu::always_inline]]
-	static inline void (log_error) (LogCategories category, const char *message) noexcept
-	{
-		log_write (category, LogLevel::Error, message);
-	}
-
-	[[gnu::always_inline]]
-	static inline void (log_fatal) (LogCategories category, const char *message) noexcept
-	{
-		log_write (category, LogLevel::Fatal, message);
-	}
-
 	void log_debug_fmt (LogCategories category, const char *format, ...) noexcept __attribute__ ((format (printf, 2, 3)));
 	void log_info_fmt (LogCategories category, const char *format, ...) noexcept __attribute__ ((format (printf, 2, 3)));
 	void log_warn_fmt (LogCategories category, const char *format, ...) noexcept __attribute__ ((format (printf, 2, 3)));

Original file line number	Diff line number	Diff line change
`@@ -359,31 +359,31 @@ void CrossReferenceTarget::mark_refs_added_if_needed () noexcept`
`359`	`359`	`[[gnu::always_inline]]`
`360`	`360`	`void BridgeProcessingShared::log_missing_add_references_method ([[maybe_unused]] jclass java_class) noexcept`
`361`	`361`	`{`
`362`		`- (xamarin::android::log_error) (LOG_DEFAULT, "Failed to find monodroidAddReferences method");`
	`362`	`+ (log_error) (LOG_DEFAULT, "Failed to find monodroidAddReferences method");`
`363`	`363`	`#if DEBUG`
`364`	`364`	`abort_if_invalid_pointer_argument (java_class, "java_class");`
`365`	`365`	`if (!Logger::gc_spew_enabled ()) [[likely]] {`
`366`	`366`	`return;`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`char *class_name = Host::get_java_class_name_for_TypeManager (java_class);`
`370`		`- xamarin::android::log_error_fmt (LOG_GC, "Missing monodroidAddReferences method for object of class %s", optional_string (class_name));`
	`370`	`+ (log_error) (LOG_GC, "Missing monodroidAddReferences method for object of class %s", optional_string (class_name));`
`371`	`371`	`free (class_name);`
`372`	`372`	`#endif`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`[[gnu::always_inline]]`
`376`	`376`	`void BridgeProcessingShared::log_missing_clear_references_method ([[maybe_unused]] jclass java_class) noexcept`
`377`	`377`	`{`
`378`		`- (xamarin::android::log_error) (LOG_DEFAULT, "Failed to find monodroidClearReferences method");`
	`378`	`+ (log_error) (LOG_DEFAULT, "Failed to find monodroidClearReferences method");`
`379`	`379`	`#if DEBUG`
`380`	`380`	`abort_if_invalid_pointer_argument (java_class, "java_class");`
`381`	`381`	`if (!Logger::gc_spew_enabled ()) [[likely]] {`
`382`	`382`	`return;`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`char *class_name = Host::get_java_class_name_for_TypeManager (java_class);`
`386`		`- xamarin::android::log_error_fmt (LOG_GC, "Missing monodroidClearReferences method for object of class %s", optional_string (class_name));`
	`386`	`+ (log_error) (LOG_GC, "Missing monodroidClearReferences method for object of class %s", optional_string (class_name));`
`387`	`387`	`free (class_name);`
`388`	`388`	`#endif`
`389`	`389`	`}`
`@@ -487,5 +487,5 @@ void BridgeProcessingShared::log_gc_summary () noexcept`
`487`	`487`	`}`
`488`	`488`	`}`
`489`	`489`
`490`		`- xamarin::android::log_info_fmt (LOG_GC, "GC cleanup summary: %zu objects tested - resurrecting %zu.", total, alive);`
	`490`	`+ log_info_fmt (LOG_GC, "GC cleanup summary: %zu objects tested - resurrecting %zu.", total, alive);`
`491`	`491`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void GCBridge::trigger_java_gc (JNIEnv *env) noexcept`
`49`	`49`
`50`	`50`	`env->ExceptionDescribe ();`
`51`	`51`	`env->ExceptionClear ();`
`52`		`- (xamarin::android::log_error) (LOG_DEFAULT, "Java GC failed");`
	`52`	`+ (log_error) (LOG_DEFAULT, "Java GC failed");`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`void GCBridge::mark_cross_references (MarkCrossReferencesArgs *args) noexcept`
`@@ -101,13 +101,13 @@ void GCBridge::log_mark_cross_references_args_if_enabled (MarkCrossReferencesArg`
`101`	`101`	`return;`
`102`	`102`	`}`
`103`	`103`
`104`		`- xamarin::android::log_info_fmt (LOG_GC, "cross references callback invoked with %zu sccs and %zu xrefs.", args->ComponentCount, args->CrossReferenceCount);`
	`104`	`+ log_info_fmt (LOG_GC, "cross references callback invoked with %zu sccs and %zu xrefs.", args->ComponentCount, args->CrossReferenceCount);`
`105`	`105`
`106`	`106`	`JNIEnv *env = OSBridge::ensure_jnienv ();`
`107`	`107`
`108`	`108`	`for (size_t i = 0; i < args->ComponentCount; ++i) {`
`109`	`109`	`const StronglyConnectedComponent &scc = args->Components [i];`
`110`		`- xamarin::android::log_info_fmt (LOG_GC, "group %zu with %zu objects", i, scc.Count);`
	`110`	`+ log_info_fmt (LOG_GC, "group %zu with %zu objects", i, scc.Count);`
`111`	`111`	`for (size_t j = 0; j < scc.Count; ++j) {`
`112`	`112`	`log_handle_context (env, scc.Contexts [j]);`
`113`	`113`	`}`
`@@ -120,7 +120,7 @@ void GCBridge::log_mark_cross_references_args_if_enabled (MarkCrossReferencesArg`
`120`	`120`	`for (size_t i = 0; i < args->CrossReferenceCount; ++i) {`
`121`	`121`	`size_t source_index = args->CrossReferences [i].SourceGroupIndex;`
`122`	`122`	`size_t dest_index = args->CrossReferences [i].DestinationGroupIndex;`
`123`		`- xamarin::android::log_info_fmt (LOG_GC, "xref [%zu] %zu -> %zu", i, source_index, dest_index);`
	`123`	`+ log_info_fmt (LOG_GC, "xref [%zu] %zu -> %zu", i, source_index, dest_index);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`@@ -134,9 +134,9 @@ void GCBridge::log_handle_context (JNIEnv env, HandleContext ctx) noexcept`
`134`	`134`	`jclass java_class = env->GetObjectClass (handle);`
`135`	`135`	`if (java_class != nullptr) {`
`136`	`136`	`char *class_name = Host::get_java_class_name_for_TypeManager (java_class);`
`137`		`- xamarin::android::log_info_fmt (LOG_GC, "gref %p [%s]", reinterpret_cast<void*>(handle), optional_string (class_name));`
	`137`	`+ log_info_fmt (LOG_GC, "gref %p [%s]", reinterpret_cast<void*>(handle), optional_string (class_name));`
`138`	`138`	`free (class_name);`
`139`	`139`	`} else {`
`140`		`- xamarin::android::log_info_fmt (LOG_GC, "gref %p [unknown class]", reinterpret_cast<void*>(handle));`
	`140`	`+ log_info_fmt (LOG_GC, "gref %p [unknown class]", reinterpret_cast<void*>(handle));`
`141`	`141`	`}`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,25 +63,14 @@ namespace xamarin::android {`
`63`	`63`	`running_in_emulator = yesno;`
`64`	`64`	`}`
`65`	`65`
`66`		`-#if defined(XA_HOST_NATIVEAOT)`
`67`	`66`	`static auto get_primary_override_dir () noexcept -> const char*`
`68`	`67`	`{`
`69`	`68`	`return primary_override_dir;`
`70`	`69`	`}`
`71`		`-#else`
`72`		`- static auto get_primary_override_dir () noexcept -> std::string const&`
`73`		`- {`
`74`		`- return primary_override_dir;`
`75`		`- }`
`76`		`-#endif`
`77`	`70`
`78`	`71`	`static void set_primary_override_dir (jstring_wrapper& home) noexcept`
`79`	`72`	`{`
`80`		`-#if defined(XA_HOST_NATIVEAOT)`
`81`	`73`	`determine_primary_override_dir (home, primary_override_dir, sizeof (primary_override_dir));`
`82`		`-#else`
`83`		`- primary_override_dir = determine_primary_override_dir (home);`
`84`		`-#endif`
`85`	`74`	`}`
`86`	`75`
`87`	`76`	`#if !defined(XA_HOST_NATIVEAOT)`
`@@ -90,7 +79,7 @@ namespace xamarin::android {`
`90`	`79`	`return native_libraries_dir;`
`91`	`80`	`}`
`92`	`81`
`93`		`- static void create_update_dir (std::string const& override_dir) noexcept`
	`82`	`+ static void create_update_dir (const char *override_dir) noexcept`
`94`	`83`	`{`
`95`	`84`	`if constexpr (Constants::is_release_build) {`
`96`	`85`	`/*`
`@@ -106,7 +95,7 @@ namespace xamarin::android {`
`106`	`95`	`}`
`107`	`96`	`}`
`108`	`97`
`109`		- log_debug (LOG_DEFAULT, "Creating public update directory: `{}`", override_dir);
	`98`	+ log_debug (LOG_DEFAULT, "Creating public update directory: `{}`", optional_string (override_dir));
`110`	`99`	`Util::create_public_directory (override_dir);`
`111`	`100`	`}`
`112`	`101`	`#endif`
`@@ -145,7 +134,6 @@ namespace xamarin::android {`
`145`	`134`	`embedded_dso_mode_enabled = yesno;`
`146`	`135`	`}`
`147`	`136`
`148`		`-#if defined(XA_HOST_NATIVEAOT)`
`149`	`137`	`static void determine_primary_override_dir (jstring_wrapper &home, char *buffer, size_t buffer_size) noexcept`
`150`	`138`	`{`
`151`	`139`	`dynamic_local_string<SENSIBLE_PATH_MAX> name { home.get_cstr () };`
`@@ -156,27 +144,13 @@ namespace xamarin::android {`
`156`	`144`
`157`	`145`	`snprintf (buffer, buffer_size, "%s", name.get ());`
`158`	`146`	`}`
`159`		`-#else`
`160`		`- static auto determine_primary_override_dir (jstring_wrapper &home) noexcept -> std::string`
`161`		`- {`
`162`		`- dynamic_local_string<SENSIBLE_PATH_MAX> name { home.get_cstr () };`
`163`		`- name.append ("/")`
`164`		`- .append (Constants::OVERRIDE_DIRECTORY_NAME)`
`165`		`- .append ("/")`
`166`		`- .append (Constants::android_lib_abi);`
`167`		`-`
`168`		`- return {name.get (), name.length ()};`
`169`		`- }`
`170`		`-#endif`
`171`	`147`
`172`	`148`	`private:`
`173`	`149`	`static inline long max_gref_count = 0;`
`174`	`150`	`static inline bool running_in_emulator = false;`
`175`	`151`	`static inline bool embedded_dso_mode_enabled = false;`
`176`		`-#if defined(XA_HOST_NATIVEAOT)`
`177`	`152`	`static inline char primary_override_dir[SENSIBLE_PATH_MAX] {};`
`178`		`-#else`
`179`		`- static inline std::string primary_override_dir;`
	`153`	`+#if !defined(XA_HOST_NATIVEAOT)`
`180`	`154`	`static inline std::string native_libraries_dir;`
`181`	`155`
`182`	`156`	`#if defined (DEBUG)`