Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-14 17:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SDK topology shutdown to include unsubscribe

Browse Source
This commit is contained in:
Alexey Rybalchenko 2019-07-23 14:30:01 +02:00 committed by Dennis Klein
parent 8789664cfd
commit be022cfab8
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fairmq/sdk/DDSSession.cxx
View File

@ -234,6 +234,11 @@ void DDSSession::SubscribeToCommands(std::function<void(const std::string& msg,
// }); // });
} }
void DDSSession::UnsubscribeFromCommands()
{
fImpl->fDDSCustomCmd.unsubscribe();
}
void DDSSession::SendCommand(const std::string& cmd) { fImpl->fDDSCustomCmd.send(cmd, ""); } void DDSSession::SendCommand(const std::string& cmd) { fImpl->fDDSCustomCmd.send(cmd, ""); }
auto operator<<(std::ostream& os, const DDSSession& session) -> std::ostream& auto operator<<(std::ostream& os, const DDSSession& session) -> std::ostream&

1
fairmq/sdk/DDSSession.h
View File

@ -71,6 +71,7 @@ class DDSSession
void StartDDSService(); void StartDDSService();
void SubscribeToCommands(std::function<void(const std::string& msg, const std::string& condition, uint64_t senderId)>); void SubscribeToCommands(std::function<void(const std::string& msg, const std::string& condition, uint64_t senderId)>);
void UnsubscribeFromCommands();
void SendCommand(const std::string&); void SendCommand(const std::string&);
friend auto operator<<(std::ostream& os, const DDSSession& session) -> std::ostream&; friend auto operator<<(std::ostream& os, const DDSSession& session) -> std::ostream&;

1
fairmq/sdk/Topology.cxx
View File

@ -182,6 +182,7 @@ void Topology::AddNewStateEntry(uint64_t senderId, const std::string& state)
Topology::~Topology() Topology::~Topology()
{ {
fDDSSession.UnsubscribeFromCommands();
{ {
std::lock_guard<std::mutex> guard(fMtx); std::lock_guard<std::mutex> guard(fMtx);
fShutdown = true; fShutdown = true;