refactor: make mod manager auto release

LiteLDev · Oct 19, 2024 · ff93ced · ff93ced
1 parent 915f576
commit ff93ced
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 5 deletions.
diff --git a/src-client/ll/core/main_win.cpp b/src-client/ll/core/main_win.cpp
@@ -116,6 +116,9 @@ LL_AUTO_TYPE_INSTANCE_HOOK(
 } // namespace ll
 
 BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ulReasonForCall, LPVOID /*lpReserved*/) {
+    if (ulReasonForCall == DLL_PROCESS_DETACH) {
+        mod::ModRegistrar::getInstance().releaseAllMods();
+    }
     if (ulReasonForCall != DLL_PROCESS_ATTACH) return TRUE;
 
     ::ll::setGamingStatus(::ll::GamingStatus::Default);

diff --git a/src-server/ll/core/main_win.cpp b/src-server/ll/core/main_win.cpp
@@ -248,6 +248,11 @@ LL_AUTO_TYPE_INSTANCE_HOOK(
 ) {
     setGamingStatus(GamingStatus::Stopping);
     mod::ModRegistrar::getInstance().disableAllMods();
+
+    command::CommandRegistrar::getInstance().clear();
+
+    mod::ModRegistrar::getInstance().releaseAllMods();
+
     origin();
 }
 

diff --git a/src-test/common/ExecTest.cpp b/src-test/common/ExecTest.cpp
@@ -38,7 +38,7 @@ CoroTask<Expected<int>> coroutine() {
     );
     parbegin = std::chrono::steady_clock::now();
     std::vector<ll::coro::CoroTask<int>> tasks{};
-    for (size_t i = 0; i < 10000000; i++) {
+    for (size_t i = 0; i < 1000000; i++) {
         tasks.emplace_back(val1());
     }
     auto vec = co_await collectAll(std::move(tasks));

diff --git a/src/ll/api/mod/Mod.cpp b/src/ll/api/mod/Mod.cpp
@@ -41,6 +41,8 @@ Mod::Mod(Manifest manifest) : mImpl(std::make_unique<Impl>()) {
 }
 Mod::~Mod() = default;
 
+void Mod::release() noexcept { mImpl.reset(); }
+
 Manifest const& Mod::getManifest() const { return mImpl->manifest; }
 
 std::string const& Mod::getName() const { return getManifest().name; }

diff --git a/src/ll/api/mod/Mod.h b/src/ll/api/mod/Mod.h
@@ -15,7 +15,6 @@ LLAPI std::filesystem::path const& getModsRoot();
 
 class ModManager;
 class Mod {
-
 public:
     enum class State {
         Enabled,
@@ -58,6 +57,8 @@ class Mod {
     LLAPI void onDisable(CallbackFn func) noexcept;
 
 protected:
+    LLAPI void release() noexcept;
+
     LLAPI void setState(State state) const;
 
     // is callback set

diff --git a/src/ll/api/mod/ModManagerRegistry.cpp b/src/ll/api/mod/ModManagerRegistry.cpp
@@ -25,6 +25,15 @@ ModManagerRegistry& ModManagerRegistry::getInstance() {
     return instance;
 }
 
+Expected<> ModManagerRegistry::releaseManagers() noexcept try {
+    std::lock_guard lock(impl->modMtx);
+    impl->loadedMods.clear();
+    impl->managers.clear();
+    return {};
+} catch (...) {
+    return makeExceptionError();
+}
+
 Expected<> ModManagerRegistry::loadMod(Manifest manifest) noexcept try {
     std::lock_guard lock(impl->modMtx);
     if (hasManager(manifest.type)) {

diff --git a/src/ll/api/mod/ModManagerRegistry.h b/src/ll/api/mod/ModManagerRegistry.h
@@ -16,6 +16,8 @@ class ModManagerRegistry {
     ModManagerRegistry();
     ~ModManagerRegistry();
 
+    Expected<> releaseManagers() noexcept;
+
     Expected<> loadMod(Manifest manifest) noexcept;
 
     Expected<> unloadMod(std::string_view name) noexcept;

diff --git a/src/ll/api/mod/NativeMod.cpp b/src/ll/api/mod/NativeMod.cpp
@@ -16,7 +16,7 @@ NativeMod::NativeMod(Manifest manifest, sys_utils::HandleT handle)
 : Mod(std::move(manifest)),
   mImpl(std::make_unique<Impl>(handle)) {}
 
-NativeMod::~NativeMod() = default;
+NativeMod::~NativeMod() { release(); }
 
 sys_utils::DynamicLibrary& NativeMod::getDynamicLibrary() { return mImpl->lib; }
 

diff --git a/src/ll/core/mod/ModRegistrar.cpp b/src/ll/core/mod/ModRegistrar.cpp
@@ -259,7 +259,8 @@ std::vector<std::string> ModRegistrar::getSortedModNames() const {
 }
 
 void ModRegistrar::enableAllMods() noexcept try {
-    auto names = getSortedModNames();
+    std::lock_guard lock(impl->mutex);
+    auto            names = getSortedModNames();
     if (names.empty()) {
         return;
     }
@@ -289,7 +290,8 @@ void ModRegistrar::enableAllMods() noexcept try {
     error_utils::printCurrentException(getLogger());
 }
 void ModRegistrar::disableAllMods() noexcept try {
-    auto names = getSortedModNames();
+    std::lock_guard lock(impl->mutex);
+    auto            names = getSortedModNames();
     if (!names.empty()) {
         getLogger().info("Disabling mods..."_tr());
         for (auto& name : std::ranges::reverse_view(names)) {
@@ -305,6 +307,15 @@ void ModRegistrar::disableAllMods() noexcept try {
 } catch (...) {
     error_utils::printCurrentException(getLogger());
 }
+void ModRegistrar::releaseAllMods() noexcept try {
+    std::lock_guard lock(impl->mutex);
+    if (auto res = ModManagerRegistry::getInstance().releaseManagers(); !res) {
+        res.error().log(getLogger(), io::LogLevel::Warn);
+    }
+    impl->deps.clear();
+} catch (...) {
+    error_utils::printCurrentException(getLogger());
+}
 
 Expected<> ModRegistrar::loadMod(std::string_view name) noexcept {
     std::lock_guard lock(impl->mutex);

diff --git a/src/ll/core/mod/ModRegistrar.h b/src/ll/core/mod/ModRegistrar.h
@@ -34,6 +34,8 @@ class ModRegistrar {
 
     void disableAllMods() noexcept;
 
+    void releaseAllMods() noexcept;
+
     Expected<> loadMod(std::string_view name) noexcept;
 
     Expected<> unloadMod(std::string_view name) noexcept;