diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.cpp b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.cpp index d63a9bfbc..fa9b9f9fe 100644 --- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.cpp +++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.cpp @@ -37,6 +37,19 @@ Lifetime const& Lifetime::Eternal() return ETERNAL; } + +Lifetime const& Lifetime::Terminated() +{ + static Lifetime TERMINATED = [] + { + Lifetime lifetime; + lifetime->terminate(); + return lifetime; + }(); + + return TERMINATED; +} + bool operator==(Lifetime const& lw1, Lifetime const& lw2) { return lw1.ptr == lw2.ptr; diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h index 4144699eb..6885999cf 100644 --- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h +++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h @@ -35,7 +35,10 @@ class RD_CORE_API Lifetime final std::shared_ptr ptr; public: + typedef LifetimeImpl::counter_t counter_t; + static Lifetime const& Eternal(); + static Lifetime const& Terminated(); // region ctor/dtor diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h index dd08b6244..c05f46078 100644 --- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h +++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h @@ -22,7 +22,7 @@ class RD_CORE_API LifetimeImpl final { public: friend class LifetimeDefinition; - + friend class SequentialLifetimes; friend class Lifetime; using counter_t = int32_t; diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.cpp b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.cpp index f57c5c696..40fa00bba 100644 --- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.cpp +++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.cpp @@ -2,32 +2,32 @@ namespace rd { -SequentialLifetimes::SequentialLifetimes(Lifetime parent_lifetime) : parent_lifetime(std::move(parent_lifetime)) +SequentialLifetimes::SequentialLifetimes(const Lifetime& parent_lifetime) : parent_lifetime(parent_lifetime) { - this->parent_lifetime->add_action([this] { set_current_lifetime(LifetimeDefinition::get_shared_eternal()); }); } Lifetime SequentialLifetimes::next() { - std::shared_ptr new_def = std::make_shared(parent_lifetime); - set_current_lifetime(new_def); - return current_def->lifetime; + Lifetime new_lifetime = parent_lifetime.create_nested(); + set_current_lifetime(new_lifetime); + return new_lifetime; } void SequentialLifetimes::terminate_current() { - set_current_lifetime(LifetimeDefinition::get_shared_eternal()); + set_current_lifetime(Lifetime::Terminated()); } bool SequentialLifetimes::is_terminated() const { - return current_def->is_eternal() || current_def->is_terminated(); + return current_lifetime->is_terminated(); } -void SequentialLifetimes::set_current_lifetime(std::shared_ptr new_def) +void SequentialLifetimes::set_current_lifetime(const Lifetime& lifetime) { - std::shared_ptr prev = current_def; - current_def = new_def; - prev->terminate(); + const Lifetime prev = current_lifetime; + current_lifetime = lifetime; + if (!prev->is_terminated()) + prev->terminate(); } } // namespace rd diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h index b909ed9cb..edaeaeb20 100644 --- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h +++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h @@ -12,9 +12,9 @@ namespace rd { class RD_CORE_API SequentialLifetimes { -private: - std::shared_ptr current_def = LifetimeDefinition::get_shared_eternal(); Lifetime parent_lifetime; + Lifetime current_lifetime = Lifetime::Terminated(); + void set_current_lifetime(const Lifetime& lifetime); public: // region ctor/dtor @@ -28,7 +28,7 @@ class RD_CORE_API SequentialLifetimes SequentialLifetimes& operator=(SequentialLifetimes&&) = delete; - explicit SequentialLifetimes(Lifetime parent_lifetime); + explicit SequentialLifetimes(const Lifetime& parent_lifetime); // endregion Lifetime next(); @@ -36,8 +36,6 @@ class RD_CORE_API SequentialLifetimes void terminate_current(); bool is_terminated() const; - - void set_current_lifetime(std::shared_ptr new_def); }; } // namespace rd diff --git a/rd-cpp/src/rd_core_cpp/src/main/reactive/base/SignalX.h b/rd-cpp/src/rd_core_cpp/src/main/reactive/base/SignalX.h index 598cc6093..03cbb2d79 100644 --- a/rd-cpp/src/rd_core_cpp/src/main/reactive/base/SignalX.h +++ b/rd-cpp/src/rd_core_cpp/src/main/reactive/base/SignalX.h @@ -3,6 +3,7 @@ #include "interfaces.h" #include "SignalCookie.h" +#include "lifetime/LifetimeDefinition.h" #include #include @@ -10,6 +11,7 @@ #include #include #include +#include namespace rd { @@ -22,57 +24,83 @@ class Signal final : public ISignal private: using WT = typename ISignal::WT; - class Event + struct Event { + using F = std::function; private: - std::function action; Lifetime lifetime; + F action; + std::atomic_int8_t state; + constexpr static int8_t ACTIVE = 0; + constexpr static int8_t FIRING = 1; + constexpr static int8_t TERMINATED = 2; public: // region ctor/dtor Event() = delete; - - template - Event(F&& action, Lifetime lifetime) : action(std::forward(action)), lifetime(lifetime) + explicit Event(const Lifetime& lifetime, F&& action) : lifetime(lifetime), action(std::forward(action)), state(ACTIVE) { } Event(Event&&) = default; - // endregion + Event& operator=(Event&& other) = default; - bool is_alive() const + bool operator()(T const& arg) { - return !lifetime->is_terminated(); - } + if (lifetime->is_terminated()) + return false; - void execute_if_alive(T const& value) const - { - if (is_alive()) + auto expected_state = ACTIVE; + // set firing flag to prevent action destruction during action firing + // skip action if it isn't active (lifetime was terminated) + if (!state.compare_exchange_strong(expected_state, FIRING)) + return false; + + expected_state = FIRING; + try { - action(value); + action(arg); + return state.compare_exchange_strong(expected_state, ACTIVE); } + catch (...) + { + if (!state.compare_exchange_strong(expected_state, ACTIVE)) + action = nullptr; + throw; + } + } + + void terminate() + { + const auto old_state = state.exchange(TERMINATED); + // release action immediatelly if it isn't firing right now + if (old_state == ACTIVE) + action = nullptr; + lifetime = Lifetime::Terminated(); } }; - using counter_t = int32_t; - using listeners_t = std::map; + using listeners_t = std::vector>; - mutable counter_t advise_id = 0; mutable listeners_t listeners, priority_listeners; - static void cleanup(listeners_t& queue) - { - util::erase_if(queue, [](Event const& e) -> bool { return !e.is_alive(); }); - } - void fire_impl(T const& value, listeners_t& queue) const { - for (auto const& p : queue) + auto it = queue.begin(); + auto end = queue.end(); + auto alive_it = it; + while (it != end) { - auto const& event = p.second; - event.execute_if_alive(value); + if (it->get()->operator()(value)) + { + if (alive_it != it) + *alive_it = std::move(*it); + ++alive_it; + } + ++it; } - cleanup(queue); + if (alive_it != end) + queue.erase(alive_it, end); } template @@ -80,9 +108,9 @@ class Signal final : public ISignal { if (lifetime->is_terminated()) return; - counter_t id = advise_id /*.load()*/; - queue.emplace(id, Event(std::forward(handler), lifetime)); - ++advise_id; + auto event_ptr = std::make_shared(lifetime, std::forward(handler)); + lifetime->add_action([event_ptr] { event_ptr->terminate(); }); + queue.push_back(std::move(event_ptr)); } public: diff --git a/rd-cpp/src/rd_framework_cpp/src/test/cases/RdSignalTest.cpp b/rd-cpp/src/rd_framework_cpp/src/test/cases/RdSignalTest.cpp index 5e627e569..386f9d725 100644 --- a/rd-cpp/src/rd_framework_cpp/src/test/cases/RdSignalTest.cpp +++ b/rd-cpp/src/rd_framework_cpp/src/test/cases/RdSignalTest.cpp @@ -249,5 +249,58 @@ TEST_F(RdFrameworkTestBase, signal_move) RdSignal signal1; RdSignal signal2(std::move(signal1)); + AfterTest(); +} + +TEST_F(RdFrameworkTestBase, signal_release_resources) +{ + RdSignal signal; + statics(signal, 1); + + bindStatic(serverProtocol.get(), signal, static_name); + + EXPECT_NO_THROW( + auto ptr = std::make_shared(0); + { + const LifetimeDefinition def; + signal.advise(def.lifetime, [ptr](auto const& value) { *ptr = value; }); + } + EXPECT_TRUE(ptr.unique()) << "Signal should release reference to ptr from lambda."; + signal.fire(42); + EXPECT_EQ(*ptr, 0) << "Signal shouldn't impact ptr value after lifetime termination."; + ); + + AfterTest(); +} + +TEST_F(RdFrameworkTestBase, signal_release_resources_from_handler) +{ + RdSignal signal; + statics(signal, 1); + bindStatic(serverProtocol.get(), signal, static_name); + + auto ptr = std::make_shared(0); + { + struct Payload + { + LifetimeDefinition def; + std::shared_ptr ptr; + }; + auto payload = std::make_shared(Payload{LifetimeDefinition(), ptr}); + signal.advise(payload->def.lifetime, [payload](auto const& value) + { + payload->def.terminate(); + *(payload->ptr) = value; + }); + // only lambda keeps payload now, it also keeps def reference preventing it from auto-terminating on out-of-scope. + // instead from callback we terminate payload which then should successfully complete callback and release all resources + // effectively destructing Payload and releasing ptr reference. + } + signal.fire(42); + EXPECT_EQ(*ptr, 42); + EXPECT_TRUE(ptr.unique()) << "Signal should release reference to ptr from lambda."; + signal.fire(24); + EXPECT_EQ(*ptr, 42) << "Signal shouldn't impact ptr value after lifetime termination."; + AfterTest(); } \ No newline at end of file