WIP, managed side

Author: grendello

src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGeneratorCLR.cs

@@ -43,7 +43,7 @@ public override string GetComment (object data, string fieldName)
 
 	// Order of fields and their type must correspond *exactly* (with exception of the
 	// ignored managed members) to that in
-	// src/monodroid/jni/xamarin-app.hh DSOCacheEntry structure
+	// src/native/clr/include/xamarin-app.hh DSOCacheEntry structure
 	[NativeAssemblerStructContextDataProvider (typeof (DSOCacheEntryContextDataProvider))]
 	sealed class DSOCacheEntry
 	{
@@ -66,8 +66,29 @@ sealed class DSOCacheEntry
 		public IntPtr handle = IntPtr.Zero;
 	}
 
+	sealed class DSOApkEntryContextDataProvider : NativeAssemblerStructContextDataProvider
+	{
+		public override string GetComment (object data, string fieldName)
+		{
+			var dso_apk_entry = EnsureType<DSOApkEntry> (data);
+			if (MonoAndroidHelper.StringEquals ("name_hash", fieldName)) {
+				return $" from name: {dso_apk_entry.Name}";
+			}
+
+			return String.Empty;
+		}
+	}
+
+	// Order of fields and their type must correspond *exactly* (with exception of the
+	// ignored managed members) to that in
+	// src/native/clr/include/xamarin-app.hh DSOApkEntry structure
+	[NativeAssemblerStructContextDataProvider (typeof (DSOApkEntryContextDataProvider))]
 	sealed class DSOApkEntry
 	{
+		[NativeAssembler (Ignore = true)]
+		public string Name = String.Empty;
+
+		[NativeAssembler (UsesDataProvider = true, NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
 		public ulong name_hash;
 		public uint  offset; // offset into the APK
 		public int   fd; // apk file descriptor
@@ -411,10 +432,9 @@ protected override void Construct (LlvmIrModule module)
 		module.Add (aot_dso_cache);
 		module.AddGlobalVariable ("dso_names_data", dsoState.NamesBlob, LlvmIrVariableOptions.GlobalConstant);
 
-		var dso_apk_entries = new LlvmIrGlobalVariable (typeof(List<StructureInstance<DSOApkEntry>>), "dso_apk_entries") {
-			ArrayItemCount = (ulong)NativeLibraries.Count,
+		var dso_apk_entries = new LlvmIrGlobalVariable (new List<StructureInstance<DSOApkEntry>> (NativeLibraries.Count), "dso_apk_entries") {
 			Options = LlvmIrVariableOptions.GlobalWritable,
-			ZeroInitializeArray = true,
+			BeforeWriteCallback = PopulateDsoApkEntries,
 		};
 		module.Add (dso_apk_entries);
 
@@ -566,16 +586,45 @@ void AddAssemblyStores (LlvmIrModule module)
 		module.Add (assembly_store);
 	}
 
+	void PopulateDsoApkEntries (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
+	{
+		var dso_apk_entries = variable.Value as List<StructureInstance<DSOApkEntry>>;
+		if (dso_apk_entries == null) {
+			throw new InvalidOperationException ("Internal error: DSO apk entries list not present.");
+		}
+
+		if (dso_apk_entries.Capacity != NativeLibraries.Count) {
+			throw new InvalidOperationException ($"Internal error: DSO apk entries count ({dso_apk_entries.Count}) is different to the native libraries count ({NativeLibraries.Count}).");
+		}
+
+		bool is64Bit = target.Is64Bit;
+		foreach (ITaskItem item in NativeLibraries) {
+			string name = Path.GetFileName (item.ItemSpec);
+			var entry = new DSOApkEntry {
+				Name = name,
+
+				name_hash = MonoAndroidHelper.GetXxHash (name, is64Bit),
+				offset = 0,
+				fd = -1,
+			};
+			dso_apk_entries.Add (new StructureInstance<DSOApkEntry> (dsoApkEntryStructureInfo, entry));
+		}
+
+		dso_apk_entries.Sort ((StructureInstance<DSOApkEntry> a, StructureInstance<DSOApkEntry> b) => {
+			return a.Instance!.name_hash.CompareTo (b.Instance!.name_hash);
+		});
+	}
+
 	void PopulatePreloadIndices (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
 	{
 		var indices = variable.Value as List<uint>;
 		if (indices == null) {
-			throw new InvalidOperationException ($"Internal error: DSO preload indices list instance not present.");
+			throw new InvalidOperationException ("Internal error: DSO preload indices list instance not present.");
 		}
 
 		var dsoState = state as DsoCacheState;
 		if (dsoState == null) {
-			throw new InvalidOperationException ($"Internal error: DSO state not present.");
+			throw new InvalidOperationException ("Internal error: DSO state not present.");
 		}
 
 		foreach (DSOCacheEntry preload in dsoState.JniPreloadDSOs) {

src/native/clr/host/host.cc

@@ -27,6 +27,7 @@
 #include <runtime-base/search.hh>
 #include <runtime-base/timing-internal.hh>
 #include <shared/log_types.hh>
+#include <shared/xxhash.hh>
 #include <startup/zip.hh>
 
 using namespace xamarin::android;
@@ -145,6 +146,16 @@ auto Host::zip_scan_callback (std::string_view const& apk_path, int apk_fd, dyna
 			return false; // This will make the scanner keep the APK open
 		}
 	}
+
+	if (!entry_name.starts_with (Zip::lib_prefix) || !entry_name.ends_with (Constants::dso_suffix)) {
+		return false;
+	}
+
+	log_debug (LOG_ASSEMBLY, "Found shared library in '{}': {}"sv, apk_path, entry_name.get ());
+	std::string_view lib_name { entry_name.get () + Zip::lib_prefix.length () };
+	hash_t name_hash = xxhash::hash (lib_name.data (), lib_name.length ());
+	log_debug (LOG_ASSEMBLY, "Library name is: {}; hash == 0x{:x}", lib_name, name_hash);
+
 	return false;
 }
 

src/native/clr/include/startup/zip.hh

@@ -56,9 +56,11 @@ namespace xamarin::android {
 		static constexpr size_t lib_prefix_size = calc_size(apk_lib_dir_name, zip_path_separator, Constants::android_lib_abi, zip_path_separator);
 		static constexpr auto lib_prefix_array = concat_string_views<lib_prefix_size> (apk_lib_dir_name, zip_path_separator, Constants::android_lib_abi, zip_path_separator);
 
+	public:
 		// .data() must be used otherwise string_view length will include the trailing \0 in the array
 		static constexpr std::string_view lib_prefix { lib_prefix_array.data () };
 
+	private:
 		static constexpr size_t assembly_store_file_path_size = calc_size(lib_prefix, Constants::assembly_store_file_name);
 		static constexpr auto assembly_store_file_path_array = concat_string_views<assembly_store_file_path_size> (lib_prefix, Constants::assembly_store_file_name);
 

src/native/common/include/runtime-base/strings.hh

@@ -722,7 +722,7 @@ namespace xamarin::android {
 		}
 
 		[[gnu::always_inline]]
-		auto starts_with_c (const char* s) noexcept -> bool
+		auto starts_with_c (const char* s) const noexcept -> bool
 		{
 			if (s == nullptr) {
 				return false;
@@ -732,19 +732,19 @@ namespace xamarin::android {
 		}
 
 		template<size_t Size> [[gnu::always_inline]]
-		auto starts_with (const char (&s)[Size]) noexcept -> bool
+		auto starts_with (const char (&s)[Size]) const noexcept -> bool
 		{
 			return starts_with (s, Size - 1);
 		}
 
 		[[gnu::always_inline]]
-		auto starts_with (std::string_view const& s) noexcept -> bool
+		auto starts_with (std::string_view const& s) const noexcept -> bool
 		{
 			return starts_with (s.data (), s.length ());
 		}
 
 		[[gnu::always_inline]]
-		auto ends_with (std::string_view const& s) noexcept -> bool
+		auto ends_with (std::string_view const& s) const noexcept -> bool
 		{
 			if (empty () || s.length () > buffer.size ()) {
 				return false;