Prepare for new p/invoke code, step #2

Author: grendello

src/native/monodroid/monodroid-glue-internal.hh

@@ -11,6 +11,7 @@
 #include "timing.hh"
 #include "cpp-util.hh"
 #include "xxhash.hh"
+#include "monodroid-dl.hh"
 
 #include <mono/utils/mono-counters.h>
 #include <mono/metadata/profiler.h>
@@ -146,18 +147,6 @@ namespace xamarin::android::internal
 		static constexpr size_t SMALL_STRING_PARSE_BUFFER_LEN = 50;
 		static constexpr bool is_running_on_desktop = false;
 
-		static constexpr std::string_view mono_component_debugger_name  { "libmono-component-debugger.so" };
-		static constexpr hash_t mono_component_debugger_hash            = xxhash::hash (mono_component_debugger_name);
-
-		static constexpr std::string_view mono_component_hot_reload_name { "libmono-component-hot_reload.so" };
-		static constexpr hash_t mono_component_hot_reload_hash          = xxhash::hash (mono_component_hot_reload_name);
-
-		static constexpr std::string_view mono_component_diagnostics_tracing_name { "libmono-component-diagnostics_tracing.so" };
-		static constexpr hash_t mono_component_diagnostics_tracing_hash = xxhash::hash (mono_component_diagnostics_tracing_name);
-
-		static constexpr std::string_view xamarin_native_tracing_name { "libxamarin-native-tracing.so" };
-		static constexpr hash_t xamarin_native_tracing_name_hash = xxhash::hash (xamarin_native_tracing_name);
-
 	public:
 		static constexpr int XA_LOG_COUNTERS = MONO_COUNTER_JIT | MONO_COUNTER_METADATA | MONO_COUNTER_GC | MONO_COUNTER_GENERICS | MONO_COUNTER_INTERP;
 
@@ -222,7 +211,7 @@ namespace xamarin::android::internal
 		static void load_symbol (void *handle, const char *name, TFunc*& fnptr) noexcept
 		{
 			char *err = nullptr;
-			void *symptr = monodroid_dlsym (handle, name, &err, nullptr);
+			void *symptr = MonodroidDl::monodroid_dlsym (handle, name, &err, nullptr);
 
 			if (symptr == nullptr) {
 				log_warn (LOG_DEFAULT, "Failed to load symbol '%s' library with handle %p. %s", name, handle, err == nullptr ? "Unknown error" : err);
@@ -233,13 +222,6 @@ namespace xamarin::android::internal
 			fnptr = reinterpret_cast<TFunc*>(symptr);
 		}
 
-		static void* monodroid_dlopen_ignore_component_or_load (hash_t hash, const char *name, int flags, char **err) noexcept;
-		static void* monodroid_dlopen (const char *name, int flags, char **err) noexcept;
-		static void* monodroid_dlopen (const char *name, int flags, char **err, void *user_data) noexcept;
-		static void* monodroid_dlsym (void *handle, const char *name, char **err, void *user_data);
-		static void* monodroid_dlopen_log_and_return (void *handle, char **err, const char *full_name, bool free_memory, bool need_api_init = false);
-		static DSOCacheEntry* find_dso_cache_entry (hash_t hash) noexcept;
-
 		int LocalRefsAreIndirect (JNIEnv *env, jclass runtimeClass, int version);
 		void create_xdg_directory (jstring_wrapper& home, size_t home_len, std::string_view const& relative_path, std::string_view const& environment_variable_name) noexcept;
 		void create_xdg_directories_and_environment (jstring_wrapper &homeDir);
@@ -348,7 +330,6 @@ namespace xamarin::android::internal
 		static void *system_native_library_handle;
 		static void *system_security_cryptography_native_android_library_handle;
 		static void *system_io_compression_native_library_handle;
-		static std::mutex   dso_handle_write_lock;
 	};
 }
 #endif

src/native/monodroid/monodroid-glue.cc

@@ -87,8 +87,6 @@ MonoCoreRuntimeProperties MonodroidRuntime::monovm_core_properties = {
 	.pinvoke_override = &MonodroidRuntime::monodroid_pinvoke_override
 };
 
-std::mutex MonodroidRuntime::dso_handle_write_lock;
-
 void
 MonodroidRuntime::thread_start ([[maybe_unused]] MonoProfiler *prof, [[maybe_unused]] uintptr_t tid)
 {
@@ -1003,173 +1001,6 @@ setup_gc_logging (void)
 }
 #endif
 
-force_inline unsigned int
-MonodroidRuntime::convert_dl_flags (int flags)
-{
-	unsigned int lflags = (flags & static_cast<int> (MONO_DL_LOCAL))
-		? JAVA_INTEROP_LIB_LOAD_LOCALLY
-		: JAVA_INTEROP_LIB_LOAD_GLOBALLY;
-	return lflags;
-}
-
-force_inline DSOCacheEntry*
-MonodroidRuntime::find_dso_cache_entry (hash_t hash) noexcept
-{
-	auto equal = [](DSOCacheEntry const& entry, hash_t key) -> bool { return entry.hash == key; };
-	auto less_than = [](DSOCacheEntry const& entry, hash_t key) -> bool { return entry.hash < key; };
-	ssize_t idx = Search::binary_search<DSOCacheEntry, equal, less_than> (hash, dso_cache, application_config.number_of_dso_cache_entries);
-	if (idx >= 0) {
-		return &dso_cache[idx];
-	}
-
-	return nullptr;
-}
-
-force_inline void*
-MonodroidRuntime::monodroid_dlopen_log_and_return (void *handle, char **err, const char *full_name, bool free_memory, [[maybe_unused]] bool need_api_init)
-{
-	if (handle == nullptr && err != nullptr) {
-		const char *load_error = dlerror ();
-		if (load_error == nullptr) {
-			load_error = "Unknown error";
-		}
-		*err = Util::monodroid_strdup_printf ("Could not load library '%s'. %s", full_name, load_error);
-	}
-
-	if (free_memory) {
-		delete[] full_name;
-	}
-
-	return handle;
-}
-
-force_inline void*
-MonodroidRuntime::monodroid_dlopen_ignore_component_or_load ([[maybe_unused]] hash_t name_hash, const char *name, int flags, char **err) noexcept
-{
-	if (MonodroidState::is_startup_in_progress ()) {
-		auto ignore_component = [&](const char *label, MonoComponent component) -> bool {
-			if ((application_config.mono_components_mask & component) != component) {
-				log_info (LOG_ASSEMBLY, "Mono '%s' component requested but not packaged, ignoring", label);
-				return true;
-			}
-
-			return false;
-		};
-
-		switch (name_hash) {
-			case mono_component_debugger_hash:
-				if (ignore_component ("Debugger", MonoComponent::Debugger)) {
-					return nullptr;
-				}
-				break;
-
-			case mono_component_hot_reload_hash:
-				if (ignore_component ("Hot Reload", MonoComponent::HotReload)) {
-					return nullptr;
-				}
-				break;
-
-			case mono_component_diagnostics_tracing_hash:
-				if (ignore_component ("Diagnostics Tracing", MonoComponent::Tracing)) {
-					return nullptr;
-				}
-				break;
-		}
-	}
-
-	unsigned int dl_flags = monodroidRuntime.convert_dl_flags (flags);
-	void * handle = AndroidSystem::load_dso_from_any_directories (name, dl_flags);
-	if (handle != nullptr) {
-		return monodroid_dlopen_log_and_return (handle, err, name, false /* name_needs_free */);
-	}
-
-	handle = AndroidSystem::load_dso (name, dl_flags, false /* skip_existing_check */);
-	return monodroid_dlopen_log_and_return (handle, err, name, false /* name_needs_free */);
-}
-
-force_inline void*
-MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err) noexcept
-{
-	hash_t name_hash = xxhash::hash (name, strlen (name));
-	log_debug (LOG_ASSEMBLY, "monodroid_dlopen: hash for name '%s' is 0x%zx", name, name_hash);
-	DSOCacheEntry *dso = find_dso_cache_entry (name_hash);
-	log_debug (LOG_ASSEMBLY, "monodroid_dlopen: hash match %sfound, DSO name is '%s'", dso == nullptr ? "not " : "", dso == nullptr ? "<unknown>" : dso->name);
-
-	if (dso == nullptr) {
-		// DSO not known at build time, try to load it
-		return monodroid_dlopen_ignore_component_or_load (name_hash, name, flags, err);
-	} else if (dso->handle != nullptr) {
-		return monodroid_dlopen_log_and_return (dso->handle, err, dso->name, false /* name_needs_free */);
-	}
-
-	if (dso->ignore) {
-		log_info (LOG_ASSEMBLY, "Request to load '%s' ignored, it is known not to exist", dso->name);
-		return nullptr;
-	}
-
-	StartupAwareLock lock (dso_handle_write_lock);
-#if defined (RELEASE)
-	if (AndroidSystem::is_embedded_dso_mode_enabled ()) {
-		DSOApkEntry *apk_entry = dso_apk_entries;
-		for (size_t i = 0; i < application_config.number_of_shared_libraries; i++) {
-			if (apk_entry->name_hash != dso->real_name_hash) {
-				apk_entry++;
-				continue;
-			}
-
-			android_dlextinfo dli;
-			dli.flags = ANDROID_DLEXT_USE_LIBRARY_FD | ANDROID_DLEXT_USE_LIBRARY_FD_OFFSET;
-			dli.library_fd = apk_entry->fd;
-			dli.library_fd_offset = apk_entry->offset;
-			dso->handle = android_dlopen_ext (dso->name, flags, &dli);
-
-			if (dso->handle != nullptr) {
-				return monodroid_dlopen_log_and_return (dso->handle, err, dso->name, false /* name_needs_free */);
-			}
-			break;
-		}
-	}
-#endif
-	unsigned int dl_flags = monodroidRuntime.convert_dl_flags (flags);
-	dso->handle = AndroidSystem::load_dso_from_any_directories (dso->name, dl_flags);
-
-	if (dso->handle != nullptr) {
-		return monodroid_dlopen_log_and_return (dso->handle, err, dso->name, false /* name_needs_free */);
-	}
-
-	dso->handle = AndroidSystem::load_dso_from_any_directories (name, dl_flags);
-	return monodroid_dlopen_log_and_return (dso->handle, err, name, false /* name_needs_free */);
-}
-
-void*
-MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err, [[maybe_unused]] void *user_data) noexcept
-{
-	if (name == nullptr) {
-		log_warn (LOG_ASSEMBLY, "monodroid_dlopen got a null name. This is not supported in NET+");
-		return nullptr;
-	}
-
-	return monodroid_dlopen (name, flags, err);
-}
-
-void*
-MonodroidRuntime::monodroid_dlsym (void *handle, const char *name, char **err, [[maybe_unused]] void *user_data)
-{
-	void *s;
-	char *e = nullptr;
-
-	s = java_interop_lib_symbol (handle, name, &e);
-
-	if (!s && err) {
-		*err = Util::monodroid_strdup_printf ("Could not find symbol '%s': %s", name, e);
-	}
-	if (e) {
-		java_interop_free (e);
-	}
-
-	return s;
-}
-
 inline void
 MonodroidRuntime::set_environment_variable_for_directory (const char *name, jstring_wrapper &value, bool createDirectory, mode_t mode)
 {
@@ -1650,7 +1481,7 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl
 	}
 
 	AndroidSystem::setup_process_args (runtimeApks);
-	mono_dl_fallback_register (monodroid_dlopen, monodroid_dlsym, nullptr, nullptr);
+	mono_dl_fallback_register (MonodroidDl::monodroid_dlopen, MonodroidDl::monodroid_dlsym, nullptr, nullptr);
 
 	set_profile_options ();
 

src/native/monodroid/monodroid-tracing.cc

@@ -25,9 +25,9 @@ MonodroidRuntime::log_traces (JNIEnv *env, TraceKind kind, const char *first_lin
 		std::lock_guard lock (tracing_init_lock);
 
 		char *err = nullptr;
-		void *handle = monodroid_dlopen (xamarin_native_tracing_name.data (), MONO_DL_EAGER, &err, nullptr);
+		void *handle = MonodroidDl::monodroid_dlopen (SharedConstants::xamarin_native_tracing_name.data (), MONO_DL_EAGER, &err, nullptr);
 		if (handle == nullptr) {
-			log_warn (LOG_DEFAULT, "Failed to load native tracing library '%s'. %s", xamarin_native_tracing_name, err == nullptr ? "Unknown error" : err);
+			log_warn (LOG_DEFAULT, "Failed to load native tracing library '%s'. %s", SharedConstants::xamarin_native_tracing_name, err == nullptr ? "Unknown error" : err);
 		} else {
 			load_symbol (handle, "xa_get_native_backtrace", _xa_get_native_backtrace);
 			load_symbol (handle, "xa_get_managed_backtrace", _xa_get_managed_backtrace);

src/native/monodroid/pinvoke-override-api.cc

@@ -5,6 +5,7 @@
 #include <mono/utils/mono-dl-fallback.h>
 
 #include "globals.hh"
+#include "monodroid-dl.hh"
 #include "monodroid-glue.hh"
 #include "monodroid-glue-internal.hh"
 #include "timing.hh"
@@ -376,7 +377,7 @@ MonodroidRuntime::load_library_symbol (const char *library_name, const char *sym
 	void *lib_handle = dso_handle == nullptr ? nullptr : *dso_handle;
 
 	if (lib_handle == nullptr) {
-		lib_handle = monodroid_dlopen (library_name, MONO_DL_LOCAL, nullptr, nullptr);
+		lib_handle = MonodroidDl::monodroid_dlopen (library_name, MONO_DL_LOCAL, nullptr, nullptr);
 		if (lib_handle == nullptr) {
 			log_warn (LOG_ASSEMBLY, "Shared library '%s' not loaded, p/invoke '%s' may fail", library_name, symbol_name);
 			return nullptr;
@@ -390,7 +391,7 @@ MonodroidRuntime::load_library_symbol (const char *library_name, const char *sym
 		}
 	}
 
-	void *entry_handle = monodroid_dlsym (lib_handle, symbol_name, nullptr, nullptr);
+	void *entry_handle = MonodroidDl::monodroid_dlsym (lib_handle, symbol_name, nullptr, nullptr);
 	if (entry_handle == nullptr) {
 		log_warn (LOG_ASSEMBLY, "Symbol '%s' not found in shared library '%s', p/invoke may fail", symbol_name, library_name);
 		return nullptr;