refactor: use strict shared ptr

xDimon · xDimon · commit dcf68c2dbed0 · 2025-03-17T15:47:50.000+08:00
Signed-off-by: Dmitriy Khaustov aka xDimon &lt;khaustov.dm@gmail.com&gt;
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -28,7 +28,9 @@ add_library(build_version
 
 add_library(app_configuration SHARED configuration.cpp)
 target_link_libraries(app_configuration
-    Boost::boost)
+    Boost::boost
+    fmt::fmt
+)
 
 add_library(app_configurator SHARED configurator.cpp)
 target_link_libraries(app_configurator
diff --git a/src/app/impl/application_impl.cpp b/src/app/impl/application_impl.cpp
@@ -20,12 +20,12 @@
 namespace jam::app {
 
   ApplicationImpl::ApplicationImpl(
-      std::shared_ptr<log::LoggingSystem> logsys,
-      std::shared_ptr<Configuration> config,
-      std::shared_ptr<StateManager> state_manager,
-      std::shared_ptr<Watchdog> watchdog,
-      std::shared_ptr<metrics::Exposer> metrics_exposer,
-      std::shared_ptr<clock::SystemClock> system_clock)
+      qtils::StrictSharedPtr<log::LoggingSystem> logsys,
+      qtils::StrictSharedPtr<Configuration> config,
+      qtils::StrictSharedPtr<StateManager> state_manager,
+      qtils::StrictSharedPtr<Watchdog> watchdog,
+      qtils::StrictSharedPtr<metrics::Exposer> metrics_exposer,
+      qtils::StrictSharedPtr<clock::SystemClock> system_clock)
       : logger_(logsys->getLogger("Application", "application")),
         app_config_(std::move(config)),
         state_manager_(std::move(state_manager)),
diff --git a/src/app/impl/application_impl.hpp b/src/app/impl/application_impl.hpp
@@ -10,6 +10,8 @@
 
 #include <memory>
 
+#include <qtils/strict_sptr.hpp>
+
 #include <metrics/registry.hpp>
 
 namespace jam {
@@ -43,22 +45,22 @@ namespace jam::app {
 
   class ApplicationImpl final : public Application {
    public:
-    ApplicationImpl(std::shared_ptr<log::LoggingSystem> logsys,
-                    std::shared_ptr<Configuration> config,
-                    std::shared_ptr<StateManager> state_manager,
-                    std::shared_ptr<Watchdog> watchdog,
-                    std::shared_ptr<metrics::Exposer> metrics_exposer,
-                    std::shared_ptr<clock::SystemClock> system_clock);
+    ApplicationImpl(qtils::StrictSharedPtr<log::LoggingSystem> logsys,
+                    qtils::StrictSharedPtr<Configuration> config,
+                    qtils::StrictSharedPtr<StateManager> state_manager,
+                    qtils::StrictSharedPtr<Watchdog> watchdog,
+                    qtils::StrictSharedPtr<metrics::Exposer> metrics_exposer,
+                    qtils::StrictSharedPtr<clock::SystemClock> system_clock);
 
     void run() override;
 
    private:
-    std::shared_ptr<soralog::Logger> logger_;
-    std::shared_ptr<Configuration> app_config_;
-    std::shared_ptr<StateManager> state_manager_;
-    std::shared_ptr<Watchdog> watchdog_;
-    std::shared_ptr<metrics::Exposer> metrics_exposer_;
-    std::shared_ptr<clock::SystemClock> system_clock_;
+    qtils::StrictSharedPtr<soralog::Logger> logger_;
+    qtils::StrictSharedPtr<Configuration> app_config_;
+    qtils::StrictSharedPtr<StateManager> state_manager_;
+    qtils::StrictSharedPtr<Watchdog> watchdog_;
+    qtils::StrictSharedPtr<metrics::Exposer> metrics_exposer_;
+    qtils::StrictSharedPtr<clock::SystemClock> system_clock_;
 
     // Metrics
     std::unique_ptr<metrics::Registry> metrics_registry_;
diff --git a/src/app/impl/state_manager_impl.cpp b/src/app/impl/state_manager_impl.cpp
@@ -92,7 +92,7 @@ namespace jam::app {
   }
 
   StateManagerImpl::StateManagerImpl(
-      std::shared_ptr<log::LoggingSystem> logging_system)
+      qtils::StrictSharedPtr<log::LoggingSystem> logging_system)
       : logger_(logging_system->getLogger("StateManager", "application")),
         logging_system_(std::move(logging_system)) {
     shuttingDownSignalsEnable();
diff --git a/src/app/impl/state_manager_impl.hpp b/src/app/impl/state_manager_impl.hpp
@@ -9,10 +9,11 @@
 #include "app/state_manager.hpp"
 
 #include <condition_variable>
-#include <csignal>
 #include <mutex>
 #include <queue>
 
+#include <qtils/strict_sptr.hpp>
+
 #include "utils/ctor_limiters.hpp"
 
 namespace soralog {
@@ -29,7 +30,7 @@ namespace jam::app {
         public StateManager,
         public std::enable_shared_from_this<StateManagerImpl> {
    public:
-    StateManagerImpl(std::shared_ptr<log::LoggingSystem> logging_system);
+    StateManagerImpl(qtils::StrictSharedPtr<log::LoggingSystem> logging_system);
 
     ~StateManagerImpl() override;
 
@@ -66,8 +67,8 @@ namespace jam::app {
 
     void shutdownRequestWaiting();
 
-    std::shared_ptr<soralog::Logger> logger_;
-    std::shared_ptr<log::LoggingSystem> logging_system_;
+    qtils::StrictSharedPtr<soralog::Logger> logger_;
+    qtils::StrictSharedPtr<log::LoggingSystem> logging_system_;
 
     std::atomic<State> state_ = State::Init;
 
diff --git a/src/injector/node_injector.cpp b/src/injector/node_injector.cpp
@@ -29,7 +29,7 @@ namespace {
 
   template <typename C>
   auto useConfig(C c) {
-    return boost::di::bind<std::decay_t<C> >().to(
+    return boost::di::bind<std::decay_t<C>>().to(
         std::move(c))[boost::di::override];
   }
 
@@ -96,6 +96,6 @@ namespace jam::injector {
 
   std::shared_ptr<app::Application> NodeInjector::injectApplication() {
     return pimpl_->injector_
-        .template create<std::shared_ptr<app::Application> >();
+        .template create<std::shared_ptr<app::Application>>();
   }
 }  // namespace jam::injector
diff --git a/src/log/logger.hpp b/src/log/logger.hpp
@@ -9,19 +9,22 @@
 #include <memory>
 #include <sstream>
 
-#include <qtils/outcome.hpp>
 #include <qtils/enum_error_code.hpp>
+#include <qtils/outcome.hpp>
+#include <qtils/strict_sptr.hpp>
 #include <soralog/level.hpp>
 #include <soralog/logger.hpp>
 #include <soralog/logging_system.hpp>
 #include <soralog/macro.hpp>
 
-#include "utils/ctor_limiters.hpp"
 #include "injector/dont_inject.hpp"
+#include "utils/ctor_limiters.hpp"
 
 namespace jam::log {
   using soralog::Level;
 
+  using Logger = qtils::StrictSharedPtr<soralog::Logger>;
+
   enum class Error : uint8_t { WRONG_LEVEL = 1, WRONG_GROUP, WRONG_LOGGER };
 
   outcome::result<Level> str2lvl(std::string_view str);
@@ -58,23 +61,22 @@ namespace jam::log {
       return logging_system_->getLogger(logger_name, group_name, level);
     }
 
-    [[nodiscard]]
-    bool setLevelOfGroup(const std::string &group_name, Level level) const {
+    [[nodiscard]] bool setLevelOfGroup(const std::string &group_name,
+                                       Level level) const {
       return logging_system_->setLevelOfGroup(group_name, level);
     }
 
-    [[nodiscard]]
-    bool resetLevelOfGroup(const std::string &group_name) const {
+    [[nodiscard]] bool resetLevelOfGroup(const std::string &group_name) const {
       return logging_system_->resetLevelOfGroup(group_name);
     }
 
-    [[nodiscard]]
-    bool setLevelOfLogger(const std::string &logger_name, Level level) const {
+    [[nodiscard]] bool setLevelOfLogger(const std::string &logger_name,
+                                        Level level) const {
       return logging_system_->setLevelOfLogger(logger_name, level);
     }
 
-    [[nodiscard]]
-    bool resetLevelOfLogger(const std::string &logger_name) const {
+    [[nodiscard]] bool resetLevelOfLogger(
+        const std::string &logger_name) const {
       return logging_system_->resetLevelOfLogger(logger_name);
     }
 
diff --git a/vcpkg-overlay/qtils/portfile.cmake b/vcpkg-overlay/qtils/portfile.cmake
@@ -2,8 +2,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO qdrvm/qtils
-  REF refs/tags/v0.1.0
-  SHA512 301987eefc98b66c42dcf731d73c11c3e9835098fc3d9a1b8e3adef9b73dad6b0198019d416e1809956620377b48e575157d56b278dcdcf65a24ecdfc134605e
+#  REF refs/tags/v0.1.0
+  REF 7fa095bed51f9c1b7d4a2c99552229df380373ea
+  SHA512 b03d6d324c28b57f20d23ae17be1e61fddf6d394c2b6fd5fff886d36018a12bd83593e25718e9d7f1ed88f8fb3b6ab71b5fb7c7b3f2f208493c8d16b22a0af2a
 )
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
 vcpkg_cmake_install()

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ namespace jam::app {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`StateManagerImpl::StateManagerImpl(`
`95`		`- std::shared_ptr<log::LoggingSystem> logging_system)`
	`95`	`+ qtils::StrictSharedPtr<log::LoggingSystem> logging_system)`
`96`	`96`	`: logger_(logging_system->getLogger("StateManager", "application")),`
`97`	`97`	`logging_system_(std::move(logging_system)) {`
`98`	`98`	`shuttingDownSignalsEnable();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace {`
`29`	`29`
`30`	`30`	`template <typename C>`
`31`	`31`	`auto useConfig(C c) {`
`32`		`- return boost::di::bind<std::decay_t<C> >().to(`
	`32`	`+ return boost::di::bind<std::decay_t<C>>().to(`
`33`	`33`	`std::move(c))[boost::di::override];`
`34`	`34`	`}`
`35`	`35`
`@@ -96,6 +96,6 @@ namespace jam::injector {`
`96`	`96`
`97`	`97`	`std::shared_ptr<app::Application> NodeInjector::injectApplication() {`
`98`	`98`	`return pimpl_->injector_`
`99`		`- .template create<std::shared_ptr<app::Application> >();`
	`99`	`+ .template create<std::shared_ptr<app::Application>>();`
`100`	`100`	`}`
`101`	`101`	`} // namespace jam::injector`