From 37a62a8d0b590710b902376ca3320cc05e954b63 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 26 Jul 2024 18:24:34 +0200 Subject: feat: remove spdlog and clean up log --- src/core/module/ModuleManager.cpp | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'src/core/module/ModuleManager.cpp') diff --git a/src/core/module/ModuleManager.cpp b/src/core/module/ModuleManager.cpp index d07ca989..ad4f9ceb 100644 --- a/src/core/module/ModuleManager.cpp +++ b/src/core/module/ModuleManager.cpp @@ -60,19 +60,17 @@ class ModuleManager::Impl { [=](GpgFrontend::DataObjectPtr) -> int { QLibrary module_library(module_library_path); if (!module_library.load()) { - GF_CORE_LOG_WARN( - "module manager failed to load module, " - "reason: broken library: {} ", - module_library.fileName()); + qCWarning(core) << "module manager failed to load module, " + "reason: broken library: " + << module_library.fileName(); return -1; } auto module = SecureCreateSharedObject(module_library); if (!module->IsGood()) { - GF_CORE_LOG_WARN( - "module manager failed to load module, " - "reason: illegal module: {}", - module_library.fileName()); + qCWarning(core) << "module manager failed to load module, " + "reason: illegal module: " + << module_library.fileName(); return -1; } @@ -231,13 +229,13 @@ auto UpsertRTValue(const QString& namespace_, const QString& key, std::any(value)); } -auto ListenRTPublishEvent(QObject* o, Namespace n, Key k, LPCallback c) - -> bool { +auto ListenRTPublishEvent(QObject* o, Namespace n, Key k, + LPCallback c) -> bool { return ModuleManager::GetInstance().ListenRTPublish(o, n, k, c); } -auto ListRTChildKeys(const QString& namespace_, const QString& key) - -> std::vector { +auto ListRTChildKeys(const QString& namespace_, + const QString& key) -> std::vector { return ModuleManager::GetInstance().ListRTChildKeys(namespace_, key); } @@ -296,8 +294,8 @@ auto ModuleManager::UpsertRTValue(Namespace n, Key k, std::any v) -> bool { return p_->UpsertRTValue(n, k, v); } -auto ModuleManager::RetrieveRTValue(Namespace n, Key k) - -> std::optional { +auto ModuleManager::RetrieveRTValue(Namespace n, + Key k) -> std::optional { return p_->RetrieveRTValue(n, k); } @@ -306,8 +304,8 @@ auto ModuleManager::ListenRTPublish(QObject* o, Namespace n, Key k, return p_->ListenPublish(o, n, k, c); } -auto ModuleManager::ListRTChildKeys(const QString& n, const QString& k) - -> std::vector { +auto ModuleManager::ListRTChildKeys(const QString& n, + const QString& k) -> std::vector { return p_->ListRTChildKeys(n, k); } -- cgit v1.2.3 From 1c4445408577a3bd5743d344cdd31f21d81dc9c0 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sat, 27 Jul 2024 10:56:19 +0200 Subject: fix: discover and solve some memory issues --- src/core/module/ModuleManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/module/ModuleManager.cpp') diff --git a/src/core/module/ModuleManager.cpp b/src/core/module/ModuleManager.cpp index ad4f9ceb..45e9f657 100644 --- a/src/core/module/ModuleManager.cpp +++ b/src/core/module/ModuleManager.cpp @@ -60,9 +60,9 @@ class ModuleManager::Impl { [=](GpgFrontend::DataObjectPtr) -> int { QLibrary module_library(module_library_path); if (!module_library.load()) { - qCWarning(core) << "module manager failed to load module, " - "reason: broken library: " - << module_library.fileName(); + qCWarning(core) << "module manager failed to load module: " + << module_library.fileName() + << ", reason: " << module_library.errorString(); return -1; } -- cgit v1.2.3 From adc5d89717cc1498c69792799c74ace413cca713 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 28 Jul 2024 17:07:15 +0200 Subject: fix: correct the spelling of 'deactivate' --- src/core/module/ModuleManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/module/ModuleManager.cpp') diff --git a/src/core/module/ModuleManager.cpp b/src/core/module/ModuleManager.cpp index 45e9f657..51611a72 100644 --- a/src/core/module/ModuleManager.cpp +++ b/src/core/module/ModuleManager.cpp @@ -170,7 +170,7 @@ class ModuleManager::Impl { __func__, nullptr)); } - void DeactiveModule(const ModuleIdentifier& identifier) { + void DeactivateModule(const ModuleIdentifier& identifier) { Thread::TaskRunnerGetter::GetInstance() .GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_Default) ->PostTask(new Thread::Task( @@ -281,8 +281,8 @@ void ModuleManager::ActiveModule(ModuleIdentifier id) { return p_->ActiveModule(id); } -void ModuleManager::DeactiveModule(ModuleIdentifier id) { - return p_->DeactiveModule(id); +void ModuleManager::DeactivateModule(ModuleIdentifier id) { + return p_->DeactivateModule(id); } auto ModuleManager::GetTaskRunner(ModuleIdentifier id) -- cgit v1.2.3 From cb626d06dee921426a2ea97662f6237e21a8781b Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 28 Jul 2024 18:00:30 +0200 Subject: feat: user can prevent all modules --- src/core/module/ModuleManager.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/core/module/ModuleManager.cpp') diff --git a/src/core/module/ModuleManager.cpp b/src/core/module/ModuleManager.cpp index 51611a72..d575d40c 100644 --- a/src/core/module/ModuleManager.cpp +++ b/src/core/module/ModuleManager.cpp @@ -31,6 +31,7 @@ #include #include +#include "core/function/GlobalSettingStation.h" #include "core/function/SecureMemoryAllocator.h" #include "core/function/basic/GpgFunctionObject.h" #include "core/model/SettingsObject.h" @@ -54,6 +55,14 @@ class ModuleManager::Impl { auto LoadAndRegisterModule(const QString& module_library_path, bool integrated_module) -> void { + // give user ability to give up all modules + auto disable_loading_all_modules = + GlobalSettingStation::GetInstance() + .GetSettings() + .value("basic/disable_loading_all_modules", false) + .toBool(); + if (disable_loading_all_modules) return; + Thread::TaskRunnerGetter::GetInstance() .GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_Default) ->PostTask(new Thread::Task( -- cgit v1.2.3