From cce03c59039442564411f6f26367342a00b612c7 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 8 Nov 2024 11:33:57 +0100 Subject: [PATCH 1/7] Remove unused ApiAction::Unregister() --- lib/remote/apiaction.cpp | 5 ----- lib/remote/apiaction.hpp | 1 - 2 files changed, 6 deletions(-) diff --git a/lib/remote/apiaction.cpp b/lib/remote/apiaction.cpp index 4da91f0d5..ccde28190 100644 --- a/lib/remote/apiaction.cpp +++ b/lib/remote/apiaction.cpp @@ -29,11 +29,6 @@ void ApiAction::Register(const String& name, const ApiAction::Ptr& action) ApiActionRegistry::GetInstance()->Register(name, action); } -void ApiAction::Unregister(const String& name) -{ - ApiActionRegistry::GetInstance()->Unregister(name); -} - ApiActionRegistry *ApiActionRegistry::GetInstance() { return Singleton::GetInstance(); diff --git a/lib/remote/apiaction.hpp b/lib/remote/apiaction.hpp index f2719c1bb..2bb98b1b6 100644 --- a/lib/remote/apiaction.hpp +++ b/lib/remote/apiaction.hpp @@ -34,7 +34,6 @@ public: static ApiAction::Ptr GetByName(const String& name); static void Register(const String& name, const ApiAction::Ptr& action); - static void Unregister(const String& name); private: std::vector m_Types; From 41f61ccba4ce8c60cb5390f99658ad984c5bbc1e Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 8 Nov 2024 11:35:35 +0100 Subject: [PATCH 2/7] Remove unused ApiFunction::Unregister() --- lib/remote/apifunction.cpp | 5 ----- lib/remote/apifunction.hpp | 1 - 2 files changed, 6 deletions(-) diff --git a/lib/remote/apifunction.cpp b/lib/remote/apifunction.cpp index 5b855cc43..89e1d8734 100644 --- a/lib/remote/apifunction.cpp +++ b/lib/remote/apifunction.cpp @@ -24,11 +24,6 @@ void ApiFunction::Register(const String& name, const ApiFunction::Ptr& function) ApiFunctionRegistry::GetInstance()->Register(name, function); } -void ApiFunction::Unregister(const String& name) -{ - ApiFunctionRegistry::GetInstance()->Unregister(name); -} - ApiFunctionRegistry *ApiFunctionRegistry::GetInstance() { return Singleton::GetInstance(); diff --git a/lib/remote/apifunction.hpp b/lib/remote/apifunction.hpp index e6113204d..5a99db518 100644 --- a/lib/remote/apifunction.hpp +++ b/lib/remote/apifunction.hpp @@ -31,7 +31,6 @@ public: static ApiFunction::Ptr GetByName(const String& name); static void Register(const String& name, const ApiFunction::Ptr& function); - static void Unregister(const String& name); private: Callback m_Callback; From d19c0637eeedfb2eb62b6a3b6a20bcf0df2e2e9c Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 8 Nov 2024 11:36:49 +0100 Subject: [PATCH 3/7] Remove unused EventQueue::UnregisterIfUnused() --- lib/remote/eventqueue.cpp | 8 -------- lib/remote/eventqueue.hpp | 1 - 2 files changed, 9 deletions(-) diff --git a/lib/remote/eventqueue.cpp b/lib/remote/eventqueue.cpp index d79b61589..7b960daa4 100644 --- a/lib/remote/eventqueue.cpp +++ b/lib/remote/eventqueue.cpp @@ -71,14 +71,6 @@ void EventQueue::RemoveClient(void *client) m_Events.erase(client); } -void EventQueue::UnregisterIfUnused(const String& name, const EventQueue::Ptr& queue) -{ - std::unique_lock lock(queue->m_Mutex); - - if (queue->m_Events.empty()) - Unregister(name); -} - void EventQueue::SetTypes(const std::set& types) { std::unique_lock lock(m_Mutex); diff --git a/lib/remote/eventqueue.hpp b/lib/remote/eventqueue.hpp index 32bd34a7a..986ad5844 100644 --- a/lib/remote/eventqueue.hpp +++ b/lib/remote/eventqueue.hpp @@ -38,7 +38,6 @@ public: Dictionary::Ptr WaitForEvent(void *client, double timeout = 5); static std::vector GetQueuesForType(const String& type); - static void UnregisterIfUnused(const String& name, const EventQueue::Ptr& queue); static EventQueue::Ptr GetByName(const String& name); static void Register(const String& name, const EventQueue::Ptr& function); From 402a6bbf40c51b408d0abc6c1c0384fd25fbb8d6 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 8 Nov 2024 11:37:44 +0100 Subject: [PATCH 4/7] Remove unused EventQueue::Unregister() --- lib/remote/eventqueue.cpp | 5 ----- lib/remote/eventqueue.hpp | 1 - 2 files changed, 6 deletions(-) diff --git a/lib/remote/eventqueue.cpp b/lib/remote/eventqueue.cpp index 7b960daa4..4705d4050 100644 --- a/lib/remote/eventqueue.cpp +++ b/lib/remote/eventqueue.cpp @@ -127,11 +127,6 @@ void EventQueue::Register(const String& name, const EventQueue::Ptr& function) EventQueueRegistry::GetInstance()->Register(name, function); } -void EventQueue::Unregister(const String& name) -{ - EventQueueRegistry::GetInstance()->Unregister(name); -} - EventQueueRegistry *EventQueueRegistry::GetInstance() { return Singleton::GetInstance(); diff --git a/lib/remote/eventqueue.hpp b/lib/remote/eventqueue.hpp index 986ad5844..833714f9d 100644 --- a/lib/remote/eventqueue.hpp +++ b/lib/remote/eventqueue.hpp @@ -41,7 +41,6 @@ public: static EventQueue::Ptr GetByName(const String& name); static void Register(const String& name, const EventQueue::Ptr& function); - static void Unregister(const String& name); private: String m_Name; From 07b274ec45f3db795b5324f29a53924d5200f16f Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 8 Nov 2024 11:38:19 +0100 Subject: [PATCH 5/7] Remove unused Registry#Unregister() --- lib/base/registry.hpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/lib/base/registry.hpp b/lib/base/registry.hpp index c13f7e1b0..55462e356 100644 --- a/lib/base/registry.hpp +++ b/lib/base/registry.hpp @@ -40,19 +40,6 @@ public: RegisterInternal(name, item, lock); } - void Unregister(const String& name) - { - size_t erased; - - { - std::unique_lock lock(m_Mutex); - erased = m_Items.erase(name); - } - - if (erased > 0) - OnUnregistered(name); - } - void Clear() { typename Registry::ItemMap items; From 4d7361527cb684b56caaf43ff2c5e6f9c2b64064 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 8 Nov 2024 11:42:21 +0100 Subject: [PATCH 6/7] Remove unused Registry#RegisterIfNew() --- lib/base/registry.hpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/base/registry.hpp b/lib/base/registry.hpp index 55462e356..874259764 100644 --- a/lib/base/registry.hpp +++ b/lib/base/registry.hpp @@ -23,16 +23,6 @@ class Registry public: typedef std::map ItemMap; - void RegisterIfNew(const String& name, const T& item) - { - std::unique_lock lock(m_Mutex); - - if (m_Items.find(name) != m_Items.end()) - return; - - RegisterInternal(name, item, lock); - } - void Register(const String& name, const T& item) { std::unique_lock lock(m_Mutex); From a9e9e14fce90f99f8b40df1f3897b73d408a212e Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 8 Nov 2024 11:43:31 +0100 Subject: [PATCH 7/7] Remove unused Registry#Clear() --- lib/base/registry.hpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/lib/base/registry.hpp b/lib/base/registry.hpp index 874259764..5a8ac26f7 100644 --- a/lib/base/registry.hpp +++ b/lib/base/registry.hpp @@ -30,25 +30,6 @@ public: RegisterInternal(name, item, lock); } - void Clear() - { - typename Registry::ItemMap items; - - { - std::unique_lock lock(m_Mutex); - items = m_Items; - } - - for (const auto& kv : items) { - OnUnregistered(kv.first); - } - - { - std::unique_lock lock(m_Mutex); - m_Items.clear(); - } - } - T GetItem(const String& name) const { std::unique_lock lock(m_Mutex);