Experimenting with zip scanning performance

Author: grendello

src/native/monodroid/embedded-assemblies-zip.cc

@@ -312,14 +312,15 @@ EmbeddedAssemblies::zip_load_assembly_store_entries (std::span<uint8_t> const& b
 	}
 }
 
+[[gnu::flatten]]
 void
 EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, [[maybe_unused]] monodroid_should_register should_register)
 {
 	uint32_t cd_offset;
 	uint32_t cd_size;
 	uint16_t cd_entries;
 
-	if (!zip_read_cd_info (fd, cd_offset, cd_size, cd_entries)) {
+	if (!zip_read_cd_info (fd, cd_offset, cd_size, cd_entries)) [[unlikely]] {
 		Helpers::abort_application (
 			LOG_ASSEMBLY,
 			Util::monodroid_strdup_printf (
@@ -329,14 +330,12 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, [[maybe_unus
 		);
 	}
 
-	md_mmap_info apk_map = md_mmap_apk_file (fd, cd_offset, cd_size, apk_name);
-
 	log_debug (LOG_ASSEMBLY, "Central directory offset: %u", cd_offset);
 	log_debug (LOG_ASSEMBLY, "Central directory size: %u", cd_size);
 	log_debug (LOG_ASSEMBLY, "Central directory entries: %u", cd_entries);
 
 	// off_t retval = ::lseek (fd, static_cast<off_t>(cd_offset), SEEK_SET);
-	// if (retval < 0) {
+	// if (retval < 0) [[unlikely]] {
 	//	Helpers::abort_application (
 	//		LOG_ASSEMBLY,
 	//		Util::monodroid_strdup_printf (
@@ -349,7 +348,6 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, [[maybe_unus
 	//	);
 	// }
 
-	std::span<uint8_t>  buf (reinterpret_cast<uint8_t*>(apk_map.area), apk_map.size);
 	const auto [prefix, prefix_len] = get_assemblies_prefix_and_length ();
 	ZipEntryLoadState state {
 		.file_fd             = fd,
@@ -366,29 +364,30 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, [[maybe_unus
 		.max_assembly_file_name_size = 0,
 	};
 
-	// ssize_t nread = read (fd, buf.data (), static_cast<read_count_type>(buf.size ()));
-	// if (static_cast<size_t>(nread) != cd_size) {
-	// 	log_fatal (LOG_ASSEMBLY, "Failed to read Central Directory from the APK archive %s. %s (nread: %d; errno: %d)", apk_name, std::strerror (errno), nread, errno);
-	// 	Helpers::abort_application ();
-	//	Helpers::abort_application (
-	//		LOG_ASSEMBLY,
-	//		Util::monodroid_strdup_printf (
-	//			"Failed to read Central Directory from APK: %s. nread=%d errno=%d File=%s",
-	//			std::strerror (errno),
-	//			nread,
-	//			errno,
-	//			apk_name
-	//		)
-	//	);
-	// }
+	std::unique_ptr<uint8_t[]> raw_data (new uint8_t[cd_size]);
+	//auto raw_data = new uint8_t[cd_size];
+	std::span<uint8_t> buf (raw_data.get (), cd_size);
+	ssize_t nread = read (fd, buf.data (), static_cast<read_count_type>(buf.size ()));
+	if (static_cast<size_t>(nread) != cd_size) [[unlikely]] {
+		Helpers::abort_application (
+			LOG_ASSEMBLY,
+			Util::monodroid_strdup_printf (
+				"Failed to read Central Directory from APK: %s. nread=%d errno=%d File=%s",
+				std::strerror (errno),
+				nread,
+				errno,
+				apk_name
+			)
+		);
+	}
 
 	if (application_config.have_assembly_store) {
 		zip_load_assembly_store_entries (buf, cd_entries, state);
 	} else {
 		zip_load_individual_assembly_entries (buf, cd_entries, should_register, state);
 	}
 
-	// TODO: unmap here
+	//delete[] raw_data;
 }
 
 template<bool NeedsNameAlloc>

src/native/monodroid/embedded-assemblies.cc

@@ -875,42 +875,6 @@ EmbeddedAssemblies::typemap_managed_to_java (MonoReflectionType *reflection_type
 	return ret;
 }
 
-EmbeddedAssemblies::md_mmap_info
-EmbeddedAssemblies::md_mmap_apk_file (int fd, uint32_t offset, size_t size, const char* filename)
-{
-	md_mmap_info file_info;
-	md_mmap_info mmap_info;
-
-	size_t pageSize        = static_cast<size_t>(Util::monodroid_getpagesize ());
-	size_t offsetFromPage  = offset % pageSize;
-	size_t offsetPage      = offset - offsetFromPage;
-	size_t offsetSize      = size + offsetFromPage;
-
-	mmap_info.area        = mmap (nullptr, offsetSize, PROT_READ, MAP_PRIVATE, fd, static_cast<off_t>(offsetPage));
-
-	if (mmap_info.area == MAP_FAILED) {
-		Helpers::abort_application (
-			LOG_ASSEMBLY,
-			Util::monodroid_strdup_printf (
-				"Could not mmap APK fd %d: %s; File=%s",
-				fd,
-				strerror (errno),
-				filename
-			)
-		);
-	}
-
-	mmap_info.size  = offsetSize;
-	file_info.area  = (void*)((const char*)mmap_info.area + offsetFromPage);
-	file_info.size  = size;
-
-	log_info (LOG_ASSEMBLY, "                       mmap_start: %08p  mmap_end: %08p  mmap_len: % 12u  file_start: %08p  file_end: %08p  file_len: % 12u      apk descriptor: %d  file: %s",
-	          mmap_info.area, reinterpret_cast<int*> (mmap_info.area) + mmap_info.size, mmap_info.size,
-	          file_info.area, reinterpret_cast<int*> (file_info.area) + file_info.size, file_info.size, fd, filename);
-
-	return file_info;
-}
-
 void
 EmbeddedAssemblies::gather_bundled_assemblies_from_apk (const char* apk, monodroid_should_register should_register)
 {

src/native/monodroid/embedded-assemblies.hh

@@ -27,6 +27,7 @@
 #include "cppcompat.hh"
 #include "shared-constants.hh"
 #include "xxhash.hh"
+#include "util.hh"
 
 #include <concepts>
 
@@ -239,7 +240,41 @@ namespace xamarin::android::internal {
 		const TypeMapEntry *typemap_managed_to_java (const char *managed_type_name) noexcept;
 #endif // DEBUG
 
-		static md_mmap_info md_mmap_apk_file (int fd, uint32_t offset, size_t size, const char* filename);
+		[[gnu::always_inline]]
+		static md_mmap_info md_mmap_apk_file (int fd, uint32_t offset, size_t size, const char* filename, md_mmap_info &original_info, md_mmap_info &adjusted_info) noexcept
+		{
+			size_t pageSize        = static_cast<size_t>(Util::monodroid_getpagesize ());
+			size_t offsetFromPage  = offset % pageSize;
+			size_t offsetPage      = offset - offsetFromPage;
+			size_t offsetSize      = size + offsetFromPage;
+
+			original_info.area        = mmap (nullptr, offsetSize, PROT_READ, MAP_PRIVATE, fd, static_cast<off_t>(offsetPage));
+
+			if (original_info.area == MAP_FAILED) {
+				log_fatal (LOG_DEFAULT, "Could not `mmap` apk fd %d entry `%s`: %s", fd, filename, strerror (errno));
+				Helpers::abort_application ();
+			}
+
+			original_info.size  = offsetSize;
+			adjusted_info.area  = (void*)((const char*)original_info.area + offsetFromPage);
+			adjusted_info.size  = size;
+
+			log_info (LOG_ASSEMBLY, "                       mmap_start: %08p  mmap_end: %08p  mmap_len: % 12u  file_start: %08p  file_end: %08p  file_len: % 12u      apk descriptor: %d  file: %s",
+									original_info.area, reinterpret_cast<int*> (original_info.area) + original_info.size, original_info.size,
+																											  adjusted_info.area, reinterpret_cast<int*> (adjusted_info.area) + adjusted_info.size, adjusted_info.size, fd, filename);
+
+			return adjusted_info;
+		}
+
+		[[gnu::flatten, gnu::always_inline]]
+		static md_mmap_info md_mmap_apk_file (int fd, uint32_t offset, size_t size, const char* filename) noexcept
+		{
+			md_mmap_info file_info;
+			md_mmap_info mmap_info;
+
+			return md_mmap_apk_file (fd, offset, size, filename, mmap_info, file_info);
+		}
+
 		static MonoAssembly* open_from_bundles_full (MonoAssemblyName *aname, char **assemblies_path, void *user_data);
 		static MonoAssembly* open_from_bundles (MonoAssemblyLoadContextGCHandle alc_gchandle, MonoAssemblyName *aname, char **assemblies_path, void *user_data, MonoError *error);