Persson-dev/Simple-Protocol-Lib
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

dispatcher: use weak_ptr

Browse Source
This commit is contained in:
Simon Pribylski
2025-03-02 20:37:54 +01:00
parent 643da71e34
commit 8d3d9e38ee
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/sp/protocol/MessageDispatcher.h
View File

@@ -17,7 +17,7 @@ namespace sp {
template <typename MessageIdType, typename MessageBase, typename MessageHandler> template <typename MessageIdType, typename MessageBase, typename MessageHandler>
class MessageDispatcher { class MessageDispatcher {
private: private:
std::map<MessageIdType, std::vector<std::shared_ptr<MessageHandler>>> m_Handlers; std::map<MessageIdType, std::vector<std::weak_ptr<MessageHandler>>> m_Handlers;
public: public:
using MessageBaseType = MessageBase; using MessageBaseType = MessageBase;
@@ -38,18 +38,20 @@ class MessageDispatcher {
* \param type The packet type * \param type The packet type
* \param handler The packet handler * \param handler The packet handler
*/ */
void RegisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler); void RegisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler);
/** /**
* \brief Unregister a packet handler * \brief Unregister a packet handler
* \param type The packet type * \param type The packet type
* \param handler The packet handler * \param handler The packet handler
*/ */
void UnregisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler); void UnregisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler);
/** /**
* \brief Unregister a packet handler * \brief Unregister a packet handler
* \param handler The packet handler * \param handler The packet handler
*/ */
void UnregisterHandler(const std::shared_ptr<MessageHandler>& a_Handler); void UnregisterHandler(const std::weak_ptr<MessageHandler>& a_Handler);
}; };
#include <sp/protocol/message/MessageDispatcherImpl.inl> #include <sp/protocol/message/MessageDispatcherImpl.inl>

28
include/sp/protocol/message/MessageDispatcherImpl.inl
View File

@@ -1,34 +1,46 @@
#pragma once #pragma once
template <typename MessageIdType, typename MessageBase, typename MessageHandler> template <typename MessageIdType, typename MessageBase, typename MessageHandler>
void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::RegisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler) { void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::RegisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler) {
auto found = std::find(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), a_Handler); auto found = std::find_if(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), [&a_Handler](const std::weak_ptr<MessageHandler>& handler){
return a_Handler.lock() == handler.lock();
});
if (found == m_Handlers[a_MessageType].end()) if (found == m_Handlers[a_MessageType].end())
m_Handlers[a_MessageType].push_back(a_Handler); m_Handlers[a_MessageType].push_back(a_Handler);
} }
template <typename MessageIdType, typename MessageBase, typename MessageHandler> template <typename MessageIdType, typename MessageBase, typename MessageHandler>
void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler) { void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler) {
auto found = std::find(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), a_Handler); auto found = std::find_if(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), [&a_Handler](const std::weak_ptr<MessageHandler>& handler){
return a_Handler.lock() == handler.lock();
});
if (found != m_Handlers[a_MessageType].end()) if (found != m_Handlers[a_MessageType].end())
m_Handlers[a_MessageType].erase(found); m_Handlers[a_MessageType].erase(found);
} }
template <typename MessageIdType, typename MessageBase, typename MessageHandler> template <typename MessageIdType, typename MessageBase, typename MessageHandler>
void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(const std::shared_ptr<MessageHandler>& a_Handler) { void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(const std::weak_ptr<MessageHandler>& a_Handler) {
for (auto& pair : m_Handlers) { for (auto& pair : m_Handlers) {
if (pair.second.empty()) if (pair.second.empty())
continue; continue;
MessageIdType type = pair.first; MessageIdType type = pair.first;
m_Handlers[type].erase(std::remove(m_Handlers[type].begin(), m_Handlers[type].end(), a_Handler), m_Handlers[type].end()); auto it = std::find_if(pair.second.begin(), pair.second.end(), [&a_Handler](const std::weak_ptr<MessageHandler>& handler){
return handler.lock() == a_Handler.lock();
});
if (it != pair.second.end())
pair.second.erase(it);
} }
} }
template <typename MessageIdType, typename MessageBase, typename MessageHandler> template <typename MessageIdType, typename MessageBase, typename MessageHandler>
void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::Dispatch(const MessageBase& a_Message) { void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::Dispatch(const MessageBase& a_Message) {
MessageIdType type = a_Message.GetId(); MessageIdType type = a_Message.GetId();
for (auto& handler : m_Handlers[type]) for (auto& handler : m_Handlers[type]) {
a_Message.Dispatch(*handler); if (!handler.expired())
a_Message.Dispatch(*handler.lock());
}
} }