Hide more platform specific implementation details.

Author: devshgraphicsprogramming

include/nbl/system/CFileViewVirtualAllocatorPOSIX.h

@@ -1,26 +1,21 @@
-#ifndef __NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_POSIX_H_INCLUDED__
-#define __NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_POSIX_H_INCLUDED__
-#include "IFileViewAllocator.h"
-#include <sys/mman.h>
+#ifndef _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_POSIX_H_INCLUDED_
+#define _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_POSIX_H_INCLUDED_
 
-#if defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_)
 
+#include "nbl/system/IFileViewAllocator.h"
+
+
+#if defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_)
 namespace nbl::system 
 {
+
 class CFileViewVirtualAllocatorPOSIX : public IFileViewAllocator
 {
-public:
-	void* alloc(size_t size) override
-	{
-		return mmap((caddr_t)0, size, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-	}
-	bool dealloc(void* data, size_t size) override
-	{
-		auto ret = munmap(data, size);
-		return ret != -1;
-	}
+	public:
+		void* alloc(size_t size) override;
+		bool dealloc(void* data, size_t size) override;
 };
-}
 
+}
 #endif
 #endif

include/nbl/system/CFileViewVirtualAllocatorWin32.h

@@ -1,25 +1,20 @@
-#ifndef __NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_WIN32_H_INCLUDED__
-#define __NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_WIN32_H_INCLUDED__
-#include "IFileViewAllocator.h"
+#ifndef _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_WIN32_H_INCLUDED_
+#define _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_WIN32_H_INCLUDED_
+
+
+#include "nbl/system/IFileViewAllocator.h"
 
-#ifdef _NBL_PLATFORM_WINDOWS_
-#include "Windows.h"
 
 namespace nbl::system 
 {
+#ifdef _NBL_PLATFORM_WINDOWS_
 class CFileViewVirtualAllocatorWin32 : public IFileViewAllocator
 {
-public:
-	void* alloc(size_t size) override
-	{
-		return VirtualAlloc(nullptr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-	}
-	bool dealloc(void* data, size_t size) override
-	{
-		return VirtualFree(data, 0, MEM_RELEASE);
-	}
+	public:
+		void* alloc(size_t size) override;
+		bool dealloc(void* data, size_t size) override;
 };
+#endif
 }
 
-#endif
 #endif

include/nbl/system/CStdoutLoggerAndroid.h

@@ -1,54 +1,21 @@
 #ifndef _NBL_SYSTEM_C_STDOUT_LOGGER_ANDROID_H_INCLUDED_
 #define _NBL_SYSTEM_C_STDOUT_LOGGER_ANDROID_H_INCLUDED_
-#ifdef _NBL_PLATFORM_ANDROID_
-#include "nbl/system/IThreadsafeLogger.h"
-#include <android/log.h>
 
+#include "nbl/system/IThreadsafeLogger.h"
 
+#ifdef _NBL_PLATFORM_ANDROID_
 namespace nbl::system
 {
-	class CStdoutLoggerAndroid : public IThreadsafeLogger
-	{
+
+class CStdoutLoggerAndroid : public IThreadsafeLogger
+{
 	public:
 		CStdoutLoggerAndroid(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
 
 	private:
-		auto getNativeLogLevel(E_LOG_LEVEL logLevel)
-		{
-			switch (logLevel)
-			{
-			case ELL_DEBUG:
-			{
-				return ANDROID_LOG_DEBUG;
-			}
-			case ELL_INFO:
-			{
-				return ANDROID_LOG_INFO;
-			}
-			case ELL_WARNING:
-			{
-				return ANDROID_LOG_WARN;
-			}
-			case ELL_ERROR:
-			{
-				return ANDROID_LOG_ERROR;
-			}
-			case ELL_PERFORMANCE:
-			{
-				return ANDROID_LOG_INFO;
-			}
-			default:
-			{
-				assert(false);
-				return ANDROID_LOG_UNKNOWN;
-			}
-			}
-		}
-		void threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override
-		{
-			(void)__android_log_print(getNativeLogLevel(logLevel), "Nabla Engine", "%s", constructLogString(fmt, logLevel, args).c_str());
-		}
-	};
+		void threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override;
+};
+
 }
 
 #endif

src/nbl/CMakeLists.txt

@@ -196,6 +196,9 @@ set(NBL_SYSTEM_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/system/CArchiveLoaderTar.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/ISystem.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/IFileArchive.cpp
+	${NBL_ROOT_PATH}/src/nbl/system/CFileViewVirtualAllocatorWin32.cpp
+	${NBL_ROOT_PATH}/src/nbl/system/CFileViewVirtualAllocatorPOSIX.cpp
+	${NBL_ROOT_PATH}/src/nbl/system/CStdoutLoggerAndroid.cpp
 )
 set(NBL_UI_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/ui/CWindowWin32.cpp

src/nbl/system/CFileViewVirtualAllocatorPOSIX.cpp

@@ -0,0 +1,17 @@
+#include "nbl/system/CFileViewVirtualAllocatorPOSIX.h"
+
+using namespace nbl::system;
+
+#if defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_)
+#include <sys/mman.h>
+
+void* CFileViewVirtualAllocatorPOSIX::alloc(size_t size) override
+{
+	return mmap((caddr_t)0, size, PROT_WRITE|PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
+}
+bool CFileViewVirtualAllocatorPOSIX::dealloc(void* data, size_t size) override
+{
+	const auto ret = munmap(data,size);
+	return ret != -1;
+}
+#endif

src/nbl/system/CFileViewVirtualAllocatorWin32.cpp

@@ -0,0 +1,16 @@
+#include "nbl/system/CFileViewVirtualAllocatorWin32.h"
+
+using namespace nbl::system;
+
+#ifdef _NBL_PLATFORM_WINDOWS_
+#include "Windows.h"
+
+void* CFileViewVirtualAllocatorWin32::alloc(size_t size)
+{
+	return VirtualAlloc(nullptr, size, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE); // TODO: are these even the right flags? Do we want to commit everything right away?
+}
+bool CFileViewVirtualAllocatorWin32::dealloc(void* data, size_t size)
+{
+	return VirtualFree(data, 0, MEM_RELEASE);
+}
+#endif

src/nbl/system/CStdoutLoggerAndroid.cpp

@@ -0,0 +1,34 @@
+#include "nbl/system/CStdoutLoggerAndroid.h"
+
+#ifdef _NBL_PLATFORM_ANDROID_
+#include <android/log.h>
+
+using namespace nbl::system;
+
+void CStdoutLoggerAndroid::threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override
+{
+	auto nativeLogLevel = ANDROID_LOG_UNKNOWN;
+	switch (logLevel)
+	{
+		case ELL_DEBUG:
+			nativeLogLevel = ANDROID_LOG_DEBUG;
+			break;
+		case ELL_INFO:
+			nativeLogLevel = ANDROID_LOG_INFO;
+			break;
+		case ELL_WARNING:
+			nativeLogLevel = ANDROID_LOG_WARN;
+			break;
+		case ELL_ERROR:
+			nativeLogLevel = ANDROID_LOG_ERROR;
+			break;
+		case ELL_PERFORMANCE:
+			nativeLogLevel = ANDROID_LOG_INFO;
+			break;
+		default:
+			assert(false);
+			break;
+	}
+	(void)__android_log_print(nativeLogLevel, "Nabla Engine: ", "%s", constructLogString(fmt,logLevel,args).c_str());
+}
+#endif