Remove dlopen bootstrap

Fernthedev · Nov 12, 2023 · 07bf8c5 · 07bf8c5
1 parent abfdba3
commit 07bf8c5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 74 deletions.
diff --git a/qpm.json b/qpm.json
@@ -4,7 +4,7 @@
   "info": {
     "name": "Paper",
     "id": "paper",
-    "version": "1.2.14",
+    "version": "3.0.0",
     "url": "https://github.com/Fernthedev/paperlog",
     "additionalData": {
       "overrideSoName": "libpaperlog.so",
@@ -23,13 +23,6 @@
       "id": "fmt",
       "versionRange": "^10.0.0",
       "additionalData": {}
-    },
-    {
-      "id": "scotland2",
-      "versionRange": "^0.1.2",
-      "additionalData": {
-        "private": true
-      }
     }
   ]
 }
diff --git a/qpm.shared.json b/qpm.shared.json
@@ -5,10 +5,11 @@
     "info": {
       "name": "Paper",
       "id": "paper",
-      "version": "1.2.14",
+      "version": "3.0.0",
       "url": "https://github.com/Fernthedev/paperlog",
       "additionalData": {
-        "overrideSoName": "libpaperlog.so"
+        "overrideSoName": "libpaperlog.so",
+        "cmake": true
       }
     },
     "workspace": {
@@ -23,30 +24,10 @@
         "id": "fmt",
         "versionRange": "^10.0.0",
         "additionalData": {}
-      },
-      {
-        "id": "scotland2",
-        "versionRange": "^0.1.2",
-        "additionalData": {
-          "private": true
-        }
       }
     ]
   },
   "restoredDependencies": [
-    {
-      "dependency": {
-        "id": "scotland2",
-        "versionRange": "=0.1.2",
-        "additionalData": {
-          "soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.2/libsl2.so",
-          "debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.2/debug_libsl2.so",
-          "overrideSoName": "libsl2.so",
-          "branchName": "version/v0_1_2"
-        }
-      },
-      "version": "0.1.2"
-    },
     {
       "dependency": {
         "id": "fmt",

diff --git a/shared/_config.h b/shared/_config.h
@@ -16,7 +16,3 @@
 #warning Removing quest modloader dependency
 #endif
 
-#if defined(PAPER_QUEST_MODLOADER) || defined(PAPER_QUEST_SCOTLAND2)
-#define PAPER_NO_INIT
-// TODO: Add some more potentially specific includes here
-#endif
diff --git a/shared/logger.hpp b/shared/logger.hpp
@@ -157,10 +157,9 @@ inline auto Backtrace(uint16_t frameCount) {
 
 std::filesystem::path getLogDirectoryPathGlobal();
 
-#ifndef PAPER_NO_INIT
-void Init(std::string_view logPath, LoggerConfig const& config = {});
+void Init(std::string_view logPath);
+void Init(std::string_view logPath, LoggerConfig const& config);
 bool IsInited();
-#endif
 
 void RegisterFileContextId(std::string_view contextId, std::string_view logPath);
 

diff --git a/src/logger.cpp b/src/logger.cpp
@@ -30,6 +30,8 @@
 #include <unwind.h>
 
 #define HAS_UNWIND
+#else
+#warning No unwind support, backtraces will do nothing
 #endif
 
 
@@ -141,8 +143,12 @@ inline void writeLog(Paper::ThreadData const& threadData, std::tm const& time, s
 
 #pragma region LoggerImpl
 
-namespace Paper::Logger {
-void Init(std::string_view logPath, LoggerConfig const& config) {
+void Paper::Logger::Init(std::string_view logPath) {
+  LoggerConfig config{};
+  return Init(logPath, config);
+}
+
+void Paper::Logger::Init(std::string_view logPath, LoggerConfig const& config) {
   if (inited) {
     throw std::runtime_error("Already started the logger thread!");
   }
@@ -162,44 +168,14 @@ void Init(std::string_view logPath, LoggerConfig const& config) {
   inited = true;
 }
 
-bool IsInited() {
+bool Paper::Logger::IsInited() {
   return inited;
 }
 
-} // namespace Paper::Logger
-
 #pragma endregion
 
 #pragma region Internal
 
-// TODO: Fix constructor memory crash
-#ifdef PAPER_NO_INIT
-#warning Using dlopen for initializing thread
-void __attribute__((constructor(1000))) dlopen_initialize() {
-  WriteStdOut(ANDROID_LOG_INFO, "PAPERLOG", "DLOpen initializing");
-
-#ifdef PAPER_QUEST_MODLOADER
-  std::string path = fmt::format("/sdcard/Android/data/{}/files/logs/paper", Modloader::getApplicationId());
-#elif defined(PAPER_QUEST_SCOTLAND2)
-  std::string path = fmt::format("/sdcard/Android/data/{}/files/logs/paper", modloader::get_application_id());
-#else
-#warning "Must have a definition for globalLogPath if PAPER_NO_INIT is defined!
-  std::string path(globalLogPath);
-#endif
-  try {
-    Paper::Logger::Init(path, Paper::LoggerConfig());
-  } catch (std::exception const& e) {
-    std::string error = fmt::format("Error occurred in logging thread! {}", e.what());
-    WriteStdOut(ANDROID_LOG_ERROR, "PAPERLOG", error);
-    throw e;
-  } catch (...) {
-    std::string error = fmt::format("Error occurred in logging thread!");
-    WriteStdOut(ANDROID_LOG_ERROR, "PAPERLOG", error);
-    throw;
-  }
-}
-#endif
-
 void Paper::Internal::LogThread() {
   try {
     moodycamel::ConsumerToken token(Paper::Internal::logQueue);
@@ -340,16 +316,12 @@ void Paper::Internal::LogThread() {
   } catch (std::exception const& e) {
     std::string error = fmt::format("Error occurred in logging thread! {}", e.what());
     logError(error);
-#ifndef PAPER_NO_INIT
     inited = false;
-#endif
     throw e;
   } catch (...) {
     std::string error = fmt::format("Error occurred in logging thread!");
     logError(error);
-#ifndef PAPER_NO_INIT
     inited = false;
-#endif
     throw;
   }