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

Topology: Use DDSTask type, remove unused member

Browse Source
This commit is contained in:
Alexey Rybalchenko 2019-08-12 11:25:09 +02:00 committed by Dennis Klein
parent 31edf948de
commit 8feffe70ba
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/sdk/Topology.cxx
View File

@ -234,7 +234,7 @@ void Topology::WaitForState()
LOG(debug) << "WaitForState shutting down"; LOG(debug) << "WaitForState shutting down";
}; };
void Topology::AddNewStateEntry(uint64_t senderId, const std::string& state) void Topology::AddNewStateEntry(DDSTask::Id senderId, const std::string& state)
{ {
std::size_t pos = state.find("->"); std::size_t pos = state.find("->");
std::string endState = state.substr(pos + 2); std::string endState = state.substr(pos + 2);

3
fairmq/sdk/Topology.h
View File

@ -139,7 +139,6 @@ class Topology
DDSSession fDDSSession; DDSSession fDDSSession;
DDSTopology fDDSTopo; DDSTopology fDDSTopo;
TopologyState fState; TopologyState fState;
std::unordered_map<uint64_t, DeviceStatus> fStateChangesSubscriptions;
bool fStateChangeOngoing; bool fStateChangeOngoing;
DeviceState fTargetState; DeviceState fTargetState;
mutable std::mutex fMtx; mutable std::mutex fMtx;
@ -153,7 +152,7 @@ class Topology
std::string fStateChangeError; std::string fStateChangeError;
void WaitForState(); void WaitForState();
void AddNewStateEntry(uint64_t senderId, const std::string& state); void AddNewStateEntry(DDSTask::Id senderId, const std::string& state);
}; };
using Topo = Topology; using Topo = Topology;