Added pthread support + increased fiber stack size

Author: RPGHacker

src/asar/CMakeLists.txt

@@ -91,6 +91,10 @@ macro(set_asar_shared_properties target msvc_lib_type_param enable_sanitizer)
 	if (UNIX)
 		target_compile_definitions(${target} PRIVATE "linux")
 		target_compile_definitions(${target} PRIVATE "stricmp=strcasecmp")
+
+		set(THREADS_PREFER_PTHREAD_FLAG ON)
+		find_package(Threads REQUIRED)
+		target_link_libraries(${target} PRIVATE Threads::Threads)
 	endif()
 
 
@@ -183,11 +187,11 @@ list(
 	"${CMAKE_CURRENT_SOURCE_DIR}/interface-shared.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/arch-shared.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/virtualfile.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/dll_helper.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/table.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/interface-lib.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/std-includes.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/platform/file-helpers.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/platform/thread-helpers.h"
 )
 
 
@@ -201,6 +205,7 @@ if(WIN32)
 		APPEND ASAR_SHARED_SOURCE_FILES
 
 		"${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/file-helpers-win32.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/thread-helpers-win32.h"
 	)
 
 	list(
@@ -220,13 +225,15 @@ elseif(UNIX)
 		APPEND ASAR_SHARED_SOURCE_FILES
 
 		"${CMAKE_CURRENT_SOURCE_DIR}/platform/linux/file-helpers-linux.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/platform/generic/thread-helpers-pthread.h"
 	)
 else()
 	# Files for any other platform
 	list(
 		APPEND ASAR_SHARED_SOURCE_FILES
 
 		"${CMAKE_CURRENT_SOURCE_DIR}/platform/generic/file-helpers-generic.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/platform/generic/thread-helpers-pthread.h"
 	)
 endif()
 

src/asar/interface-cli.cpp

@@ -75,7 +75,7 @@ void set_text_color(FILE* output_loc, string* in_out_str, ansi_text_color::e col
 		}
 	}
 #elif defined(_WIN32)
-	// Currently using SetConsoleTextAttribute() approach over an ASCI escape character
+	// Currently using SetConsoleTextAttribute() approach over an ASCII escape character
 	// approach because it makes the output text easier to parse. Unfortunately, this
 	// also currently makes this a Windows-only solution.
 	CONSOLE_SCREEN_BUFFER_INFO screenInfo;

src/asar/interface-lib.cpp

@@ -5,9 +5,7 @@
 #include "interface-shared.h"
 #include "assembleblock.h"
 #include "asar_math.h"
-#if defined(_WIN32)
-#include "dll_helper.h"
-#endif
+#include "platform/thread-helpers.h"
 
 #if defined(CPPCLI)
 #define EXPORT extern "C"
@@ -25,7 +23,7 @@
 // when used in combination with -fsanitize=address.
 #if defined(_WIN32) && defined(NDEBUG)
 #	define RUN_VIA_FIBER
-#elif defined(_WIN32)
+#else
 #	define RUN_VIA_THREAD
 #endif
 

src/asar/platform/generic/thread-helpers-pthread.h

@@ -0,0 +1,57 @@
+#pragma once
+
+#include <stdint.h>
+#include <pthread.h>
+
+struct function_pointer_wrapper /*have this struct at global level*/
+{
+	static void* (*thread_callback)(void*);
+	static void* execute_thread(void* parameter) { return thread_callback(parameter); }
+};
+
+void* (*function_pointer_wrapper::thread_callback)(void*) = nullptr;
+
+template <typename functor>
+bool run_as_thread(functor&& callback) {
+	struct thread_wrapper {
+		functor& callback;
+		bool result;
+
+		void* execute() {
+			result = callback();
+			if (result)
+				pthread_exit(NULL);
+			else
+				pthread_exit(reinterpret_cast<void*>((uintptr_t)-1));
+		}
+
+	} wrapper{ callback, false };
+
+	function_pointer_wrapper::thread_callback = [](void* parameter) {
+		return reinterpret_cast<thread_wrapper*>(parameter)->execute();
+	};
+	
+	pthread_attr_t settings;                                                         
+	pthread_t thread_id;
+	int ret;
+	
+	ret = pthread_attr_init(&settings);                                               
+	if (ret == -1){
+		return callback();
+	}
+	
+	ret = pthread_attr_setstacksize(&settings, 16 * 1024 * 1024);                                               
+	if (ret == -1){
+		return callback();
+	}
+
+    ret = pthread_create(&thread_id, &settings, &function_pointer_wrapper::execute_thread, &wrapper);
+	if (ret == -1){
+		return callback();
+	}
+
+	void* thread_ret;
+	pthread_join(thread_id, &thread_ret);
+
+	return wrapper.result;
+}

src/asar/platform/thread-helpers.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#if defined(windows)
+#	include "windows/thread-helpers-win32.h"
+#else
+#	include "generic/thread-helpers-pthread.h"
+#endif

src/asar/dll_helper.h renamed to src/asar/platform/windows/thread-helpers-win32.h

@@ -1,8 +1,10 @@
+#pragma once
+
 #if defined(_WIN32)
 
 #include <windows.h>
 
-struct function_pointer_wrapper/*have this struct at global level*/
+struct function_pointer_wrapper /*have this struct at global level*/
 {
 	static void (*fiber_callback)(void *);
 	static void __stdcall execute_fiber(void* parameter) { return fiber_callback(parameter); }
@@ -31,7 +33,7 @@ bool run_as_fiber(functor &&callback) {
 	function_pointer_wrapper::fiber_callback = [](void *parameter){
 		reinterpret_cast<fiber_wrapper*>(parameter)->execute();
 	};
-	auto fiber = CreateFiberEx(4*1024*1024, 8*1024*1024, 0, &function_pointer_wrapper::execute_fiber, &wrapper);
+	auto fiber = CreateFiberEx(16*1024*1024, 16*1024*1024, 0, &function_pointer_wrapper::execute_fiber, &wrapper);
 
 	if (!fiber) {
 		return callback();