allow stateful allocators to implement APK Archive file views

Also bring TAR archive reader up to par with old impl.

Author: devshgraphicsprogramming

include/nbl/system/CFileArchive.h

@@ -10,6 +10,9 @@
 #include "nbl/system/CFileView.h"
 #include "nbl/system/IFileViewAllocator.h"
 
+#ifdef _NBL_PLATFORM_ANDROID_
+#include "nbl/system/CFileViewAPKAllocator.h"
+#endif
 
 namespace nbl::system
 {
@@ -90,6 +93,13 @@ class CFileArchive : public IFileArchive
 				case EAT_VIRTUAL_ALLOC:
 					return getFile_impl<VirtualMemoryAllocator>(item);
 					break;
+				case EAT_APK_ALLOCATOR:
+					#ifdef _NBL_PLATFORM_ANDROID_
+					return getFile_impl<CFileViewAPKAllocator>(item);
+					#else
+					assert(false);
+					#endif
+					break;
 				default: // directory or something
 					break;
 			}
@@ -134,17 +144,23 @@ class CFileArchive : public IFileArchive
 					m_fileFlags+item->ID,
 					getDefaultAbsolutePath()/item->pathRelativeToArchive,
 					IFile::ECF_READ, // TODO: stay like this until we allow write access to archived files
-					std::get<void*>(fileBuffer),
-					std::get<size_t>(fileBuffer),
-					Allocator() // no archive uses stateful allocators yet
+					fileBuffer.buffer,
+					fileBuffer.size,
+					Allocator(fileBuffer.allocatorState) // no archive uses stateful allocators yet
 				);
 			}
 			// don't grab because we've already grabbed
 			return core::smart_refctd_ptr<CInnerArchiveFile<Allocator>>(file,core::dont_grab);
 		}
 
 		// this function will return a buffer that needs to be deallocated with an allocator matching `item->allocatorType`
-		virtual std::pair<void*,size_t> getFileBuffer(const IFileArchive::SListEntry* item) = 0;
+		struct file_buffer_t
+		{
+			void* buffer;
+			size_t size;
+			void* allocatorState;
+		};
+		virtual file_buffer_t getFileBuffer(const IFileArchive::SListEntry* item) = 0;
 
 		std::atomic_flag* m_fileFlags = nullptr;
 		std::byte* m_filesBuffer = nullptr;

include/nbl/system/CFileViewAPKAllocator.h

@@ -0,0 +1,23 @@
+#ifndef _NBL_SYSTEM_C_FILE_VIEW_APK_ALLOCATOR_H_INCLUDED_
+#define _NBL_SYSTEM_C_FILE_VIEW_APK_ALLOCATOR_H_INCLUDED_
+
+
+#include "nbl/system/IFileViewAllocator.h"
+
+
+namespace nbl::system
+{
+#ifdef _NBL_PLATFORM_ANDROID_
+class CFileViewAPKAllocator : public IFileViewAllocator
+{
+	public:
+		using IFileViewAllocator::IFileViewAllocator;
+
+		// should never be called
+		void* alloc(size_t size) override;
+		bool dealloc(void* data, size_t size) override;
+};
+#endif
+}
+
+#endif

include/nbl/system/CFileViewVirtualAllocatorPOSIX.h

@@ -7,6 +7,8 @@ namespace nbl::system
 class CFileViewVirtualAllocatorPOSIX : public IFileViewAllocator
 {
 	public:
+		using IFileViewAllocator::IFileViewAllocator;
+
 		void* alloc(size_t size) override;
 		bool dealloc(void* data, size_t size) override;
 };

include/nbl/system/CFileViewVirtualAllocatorWin32.h

@@ -7,6 +7,8 @@ namespace nbl::system
 class CFileViewVirtualAllocatorWin32 : public IFileViewAllocator
 {
 	public:
+		using IFileViewAllocator::IFileViewAllocator;
+
 		void* alloc(size_t size) override;
 		bool dealloc(void* data, size_t size) override;
 };

include/nbl/system/CSystemAndroid.h

@@ -4,27 +4,29 @@
 
 #include "nbl/system/ISystem.h"
 
-
-namespace nbl::system
-{
 #ifdef _NBL_PLATFORM_ANDROID_
 #include "nbl/system/ISystemPOSIX.h"
 
 struct ANativeActivity;
 struct JNIEnv;
 
+namespace nbl::system
+{
+
 class CSystemAndroid final : public ISystemPOSIX
 {
-		ANativeActivity* m_nativeActivity;
-		JNIEnv* m_jniEnv;
 	public:
-		CSystemAndroid(ANativeActivity* activity, JNIEnv* jni, const system::path& APKResourcesPath);
+		CSystemAndroid(ANativeActivity* activity, JNIEnv* jni, const path& APKResourcesPath);
 
 		//
 		SystemInfo getSystemInfo() const override;
+
+	protected:
+		ANativeActivity* m_nativeActivity;
+		JNIEnv* m_jniEnv;
 };
 
-#endif
 }
+#endif
 
 #endif

include/nbl/system/IFileArchive.h

@@ -27,6 +27,7 @@ class IFileArchive : public core::IReferenceCounted
 			EAT_NONE = 0,
 			EAT_NULL, // read directly from archive's underlying mapped file
 			EAT_VIRTUAL_ALLOC, // decompress to RAM (with sparse paging)
+			EAT_APK_ALLOCATOR, // specialization to be able to call `AAsset_close`
 			EAT_MALLOC // decompress to RAM
 		};
 		//! An entry in a list of items, can be a folder or a file.

include/nbl/system/IFileViewAllocator.h

@@ -13,14 +13,21 @@ namespace nbl::system
 class IFileViewAllocator
 {
 	public:
+		IFileViewAllocator(void* _state) : m_state(_state) {}
+
 		virtual void* alloc(size_t size) = 0;
 		virtual bool dealloc(void* data, size_t size) = 0;
+
+	protected:
+		void* m_state;
 };
 
 // Regular old file in RAM
 class CPlainHeapAllocator : public IFileViewAllocator
 {
 	public:
+		using IFileViewAllocator::IFileViewAllocator;
+
 		void* alloc(size_t size) override
 		{
 			return malloc(size);
@@ -37,6 +44,8 @@ class CPlainHeapAllocator : public IFileViewAllocator
 class CNullAllocator : public IFileViewAllocator
 {
 	public:
+		using IFileViewAllocator::IFileViewAllocator;
+
 		void* alloc(size_t size) override
 		{
 			return nullptr;

source/Nabla/CTarReader.cpp

@@ -200,11 +200,13 @@ set(NBL_SYSTEM_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/system/ILogger.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CArchiveLoaderZip.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CArchiveLoaderTar.cpp
+	${NBL_ROOT_PATH}/src/nbl/system/CAPKResourcesArchive.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/ISystem.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/IFileArchive.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CStdoutLoggerAndroid.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CFileViewVirtualAllocatorWin32.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CFileViewVirtualAllocatorPOSIX.cpp
+	${NBL_ROOT_PATH}/src/nbl/system/CFileViewAPKAllocator.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CFileWin32.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CFilePOSIX.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CSystemWin32.cpp

src/nbl/CMakeLists.txt

@@ -0,0 +1,62 @@
+#include "nbl/system/CAPKResourcesArchive.h"
+
+using namespace nbl;
+using namespace nbl::system;
+
+#ifdef _NBL_PLATFORM_ANDROID_
+#include <jni.h>
+#include <asset_manager.h>
+
+CAPKResourcesArchive::CAPKResourcesArchive(const path& _path, system::logger_opt_smart_ptr&& logger, ANativeActivity* act, JNIEnv* jni)
+	: CFileArchive(path(_path),std::move(logger),computeItems(_path.string())), m_mgr(act->assetManager), m_activity(act), m_jniEnv(jni)
+{
+}
+
+core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const std::string& asset_path)
+{
+	auto context_object = activity->clazz;
+	auto getAssets_method = env->GetMethodID(env->GetObjectClass(context_object), "getAssets", "()Landroid/content/res/AssetManager;");
+	auto assetManager_object = env->CallObjectMethod(context_object,getAssets_method);
+	auto list_method = env->GetMethodID(env->GetObjectClass(assetManager_object), "list", "(Ljava/lang/String;)[Ljava/lang/String;");
+
+	jstring path_object = env->NewStringUTF(asset_path.c_str());
+
+	auto files_object = (jobjectArray)env->CallObjectMethod(assetManager_object, list_method, path_object);
+
+	env->DeleteLocalRef(path_object);
+
+	auto length = env->GetArrayLength(files_object);
+	
+	core::vector<IFileArchive::SListEntry> result;
+	for (decltype(length) i=0; i<length; i++)
+	{
+		jstring jstr = (jstring)env->GetObjectArrayElement(files_object,i);
+
+		const char* filename = env->GetStringUTFChars(jstr,nullptr);
+		if (filename != nullptr)
+		{
+			auto& item = result.emplace_back();
+			item.pathRelativeToArchive = filename;
+			{
+				AAsset* asset = AAssetManager_open(m_mgr,filename,AASSET_MODE_STREAMING);
+				item.size = AAsset_getLength(asset);
+				AAsset_close(asset);
+			}
+			item.offset = 0xdeadbeefu;
+			item.ID = i;
+			item.allocatorType = EAT_APK_ALLOCATOR;
+				
+			env->ReleaseStringUTFChars(jstr,filename);
+		}
+
+		env->DeleteLocalRef(jstr);
+	}
+}
+
+CFileArchive::file_buffer_t CAPKResourcesArchive::getFileBuffer(const IFileArchive::SListEntry* item)
+{
+	AAsset* asset = AAssetManager_open(m_mgr,item->pathRelativeToArchive.string().c_str(),AASSET_MODE_BUFFER);
+	return {AAsset_getBuffer(asset),AAsset_getLength(asset),asset};
+}
+
+#endif