diff --git a/CMakeLists.txt b/CMakeLists.txt index 276dc903..24e81ee1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ if(BUILD_NANOMSG_TRANSPORT) endif() if(BUILD_SDK) - set(required_dds_version 2.5.7) + set(required_dds_version 2.5.20) else() set(required_dds_version 2.4) endif() diff --git a/examples/dds/fairmq-start-ex-dds.sh.in b/examples/dds/fairmq-start-ex-dds.sh.in index f8ba53e2..0168edcb 100755 --- a/examples/dds/fairmq-start-ex-dds.sh.in +++ b/examples/dds/fairmq-start-ex-dds.sh.in @@ -41,8 +41,13 @@ dds-info --wait-for-idle-agents ${requiredNofAgents} topologyFile=@DATA_DIR@/ex-dds-topology.xml 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-info --active-topology echo "------------------------" echo "...waiting for Topology to finish..." @@ -54,7 +59,10 @@ echo "...waiting for ${requiredNofAgents} idle agents..." dds-info --wait-for-idle-agents ${requiredNofAgents} echo "------------------------" +# TODO Uncomment once DDS 2.6 is released +# dds-info --active-topology dds-topology --stop +# dds-info --active-topology dds-agent-cmd getlog -a logDir="${wrkDir}/logs" diff --git a/fairmq/sdk/DDSSession.cxx b/fairmq/sdk/DDSSession.cxx index af1d4c61..c2773ff5 100644 --- a/fairmq/sdk/DDSSession.cxx +++ b/fairmq/sdk/DDSSession.cxx @@ -227,7 +227,6 @@ void DDSSession::StartDDSService() { fImpl->fDDSService.start(fImpl->fId); } void DDSSession::SubscribeToCommands(std::function cb) { - fImpl->fSession.unsubscribe(); // TODO REMOVE THIS HACK!!!! fImpl->fDDSCustomCmd.subscribe(cb); // fImpl->fDDSCustomCmd.subscribeOnReply([](const std::string& reply) { // LOG(debug) << reply; diff --git a/fairmq/sdk/DDSTopology.cxx b/fairmq/sdk/DDSTopology.cxx index a405d4e9..030cb9bc 100644 --- a/fairmq/sdk/DDSTopology.cxx +++ b/fairmq/sdk/DDSTopology.cxx @@ -82,13 +82,13 @@ std::vector DDSTopology::GetDeviceList() 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& 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&) { - return os << "DDS topology: " /*<< t.GetName()*/; + return os << "DDS topology: " << t.GetName(); } } // namespace sdk diff --git a/fairmq/sdk/DDSTopology.h b/fairmq/sdk/DDSTopology.h index 9f7cec60..dc37c099 100644 --- a/fairmq/sdk/DDSTopology.h +++ b/fairmq/sdk/DDSTopology.h @@ -50,7 +50,7 @@ class DDSTopology std::vector GetDeviceList(); /// @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&;