diff --git a/src/lib/typed-allocation-manager.hpp b/src/lib/typed-allocation-manager.hpp index febfc8449..1a4887121 100644 --- a/src/lib/typed-allocation-manager.hpp +++ b/src/lib/typed-allocation-manager.hpp @@ -265,7 +265,8 @@ namespace lib { Slot allocateSlot () { - TODO ("redirect to the corresponding pool allocator"); + ////////////////////////////////////////////////TICKET #231 :redirect to the corresponding pool allocator + TRACE (memory, "allocate %s", util::tyStr().c_str()); void* space = new char[sizeof(XX)]; allocCnt_.inc(); return Slot (this, space); @@ -275,7 +276,8 @@ namespace lib { void releaseSlot (void* entry) { - TODO ("redirect to the corresponding pool allocator"); + ////////////////////////////////////////////////TICKET #231 :redirect to the corresponding pool allocator + TRACE (memory, "release %s", util::tyStr().c_str()); typedef char Storage[sizeof(XX)]; delete[] reinterpret_cast (entry); allocCnt_.dec(); diff --git a/src/proc/control/command-registry.hpp b/src/proc/control/command-registry.hpp index 83b2d57a6..b650e05d4 100644 --- a/src/proc/control/command-registry.hpp +++ b/src/proc/control/command-registry.hpp @@ -123,15 +123,25 @@ namespace control { typedef unordered_map > CmdIndex; typedef map< const Command*, Symbol, order_by_impl> ReverseIndex; + TypedAllocationManager allocator_; CmdIndex index_; ReverseIndex ridx_; - TypedAllocationManager allocator_; public: static lib::Singleton instance; + ~CommandRegistry() + { + INFO (command, "Shutting down Command system..."); + //////////////////////TICKET #295 : possibly remotely trigger Command mass suicide here.... + ridx_.clear(); + index_.clear(); + } + + + /** register a command (Frontend) under the given ID * @return either the new command, or an already existing * command registered under the given ID */ diff --git a/tests/45controller.tests b/tests/45controller.tests index ec2cf9d47..86b76261e 100644 --- a/tests/45controller.tests +++ b/tests/45controller.tests @@ -3,7 +3,7 @@ TESTING "Component Test Suite: Proc-Layer controller" ./test-components --group= -PLANNED "CommandBasic_test" CommandBasic_test < using lumiera::Time; -//using util::contains; using std::rand; @@ -45,7 +42,7 @@ namespace test { namespace { // functions to be invoked through the command system - + void operate (P