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

SDK: Require DDS 2.5.20

Browse Source 
* Use the new interface: CTopology::getName
* Enhance Example.DDS
This commit is contained in:
Dennis Klein 2019-07-24 10:23:15 +02:00
parent 7d1ee82c6b
commit de4fca177e
No known key found for this signature in database
GPG Key ID: 08E62D23FA0ECBBC
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -75,7 +75,7 @@ if(BUILD_NANOMSG_TRANSPORT)
endif() endif()
if(BUILD_SDK) if(BUILD_SDK)
set(required_dds_version 2.5.7) set(required_dds_version 2.5.20)
else() else()
set(required_dds_version 2.4) set(required_dds_version 2.4)
endif() endif()

8
examples/dds/fairmq-start-ex-dds.sh.in
View File

@ -41,8 +41,13 @@ dds-info --wait-for-idle-agents ${requiredNofAgents}
topologyFile=@DATA_DIR@/ex-dds-topology.xml topologyFile=@DATA_DIR@/ex-dds-topology.xml
echo "TOPOLOGY FILE: ${topologyFile}" echo "TOPOLOGY FILE: ${topologyFile}"
# TODO Uncomment once DDS 2.6 is released
# echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${topologyFile})"
# TODO Uncomment once DDS 2.6 is released
# dds-info --active-topology
dds-topology --disable-validation --activate ${topologyFile} dds-topology --disable-validation --activate ${topologyFile}
# dds-info --active-topology
echo "------------------------" echo "------------------------"
echo "...waiting for Topology to finish..." echo "...waiting for Topology to finish..."
@ -54,7 +59,10 @@ echo "...waiting for ${requiredNofAgents} idle agents..."
dds-info --wait-for-idle-agents ${requiredNofAgents} dds-info --wait-for-idle-agents ${requiredNofAgents}
echo "------------------------" echo "------------------------"
# TODO Uncomment once DDS 2.6 is released
# dds-info --active-topology
dds-topology --stop dds-topology --stop
# dds-info --active-topology
dds-agent-cmd getlog -a dds-agent-cmd getlog -a
logDir="${wrkDir}/logs" logDir="${wrkDir}/logs"

1
fairmq/sdk/DDSSession.cxx
View File

@ -227,7 +227,6 @@ void DDSSession::StartDDSService() { fImpl->fDDSService.start(fImpl->fId); }
void DDSSession::SubscribeToCommands(std::function<void(const std::string& msg, const std::string& condition, uint64_t senderId)> cb) void DDSSession::SubscribeToCommands(std::function<void(const std::string& msg, const std::string& condition, uint64_t senderId)> cb)
{ {
fImpl->fSession.unsubscribe(); // TODO REMOVE THIS HACK!!!!
fImpl->fDDSCustomCmd.subscribe(cb); fImpl->fDDSCustomCmd.subscribe(cb);
// fImpl->fDDSCustomCmd.subscribeOnReply([](const std::string& reply) { // fImpl->fDDSCustomCmd.subscribeOnReply([](const std::string& reply) {
// LOG(debug) << reply; // LOG(debug) << reply;

6
fairmq/sdk/DDSTopology.cxx
View File

@ -82,13 +82,13 @@ std::vector<uint64_t> DDSTopology::GetDeviceList()
return taskIDs; return taskIDs;
} }
// auto DDSTopology::GetName() const -> std::string { return fImpl->fTopo.getName(); } auto DDSTopology::GetName() const -> std::string { return fImpl->fTopo.getName(); }
auto operator<<(std::ostream& os, const DDSTopology& t) -> std::ostream& auto operator<<(std::ostream& os, const DDSTopology& t) -> std::ostream&
try { try {
return os << "DDS topology: " /*<< t.GetName() <<*/ " (loaded from " << t.GetTopoFile() << ")"; return os << "DDS topology: " << t.GetName() << " (loaded from " << t.GetTopoFile() << ")";
} catch (std::runtime_error&) { } catch (std::runtime_error&) {
return os << "DDS topology: " /*<< t.GetName()*/; return os << "DDS topology: " << t.GetName();
} }
} // namespace sdk } // namespace sdk

2
fairmq/sdk/DDSTopology.h
View File

@ -50,7 +50,7 @@ class DDSTopology
std::vector<uint64_t> GetDeviceList(); std::vector<uint64_t> GetDeviceList();
/// @brief Get the name of the topology /// @brief Get the name of the topology
// auto GetName() const -> std::string; auto GetName() const -> std::string;
friend auto operator<<(std::ostream&, const DDSTopology&) -> std::ostream&; friend auto operator<<(std::ostream&, const DDSTopology&) -> std::ostream&;