Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(WIP) SDK: Implement Topology::ChangeState

Browse Source
This commit is contained in:
Dennis Klein
2019-07-19 21:06:10 +02:00
committed by Dennis Klein
parent 499ffcd300
commit 18dc536f3d
16 changed files with 619 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/CMakeLists.txt
View File

@@ -287,7 +287,7 @@ if(BUILD_SDK)
add_testsuite(SDK
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
# sdk/_dds.cxx
sdk/_dds.cxx
sdk/_topology.cxx
sdk/TopologyFixture.h

24
test/sdk/TopologyFixture.h
View File

@@ -13,12 +13,10 @@
#include <fairmq/SDK.h>
#include <fairmq/Tools.h>
#include <DDS/Topology.h>
#include <chrono>
#include <cstdlib>
#include <fairlogger/Logger.h>
#include <gtest/gtest.h>
#include <stdlib.h>
#include <thread>
namespace fair {
@@ -45,14 +43,14 @@ struct LoggerConfig
struct TopologyFixture : ::testing::Test
{
TopologyFixture()
: mLoggerConfig()
, mDDSTopologyFile(std::string(SDK_TESTSUITE_SOURCE_DIR) + "/test_topo.xml")
: mDDSTopoFile(tools::ToString(SDK_TESTSUITE_SOURCE_DIR, "/test_topo.xml"))
, mDDSEnv(CMAKE_CURRENT_BINARY_DIR)
, mDDSSession(mDDSEnv)
, mDDSTopology(mDDSTopologyFile)
{}
//
//
, mDDSTopo(mDDSTopoFile, mDDSEnv)
{
mDDSSession.StopOnDestruction();
}
// auto ActivateDDSTopology(const std::string& topology_file) -> void {
// LOG(debug) << "ActivateDDSTopology(\"" << topology_file << "\")";
// }
@@ -60,20 +58,22 @@ struct TopologyFixture : ::testing::Test
auto SetUp() -> void override {
LOG(info) << mDDSEnv;
LOG(info) << mDDSSession;
mDDSSession.RequestCommanderInfo();
mDDSSession.SubmitAgents(2);
mDDSSession.RequestCommanderInfo();
std::this_thread::sleep_for(std::chrono::seconds(1)); // TODO implement WaitForIdleAgents
mDDSSession.ActivateTopology(mDDSTopologyFile);
mDDSSession.ActivateTopology(mDDSTopoFile);
mDDSSession.RequestCommanderInfo();
}
auto TearDown() -> void override {
mDDSSession.Stop();
}
LoggerConfig mLoggerConfig;
std::string mDDSTopologyFile;
std::string mDDSTopoFile;
sdk::DDSEnvironment mDDSEnv;
sdk::DDSSession mDDSSession;
dds::topology_api::CTopology mDDSTopology;
sdk::DDSTopology mDDSTopo;
};
} /* namespace test */

33
test/sdk/_dds.cxx
View File

@@ -15,7 +15,7 @@
namespace {
auto session_test() -> void
auto setup() -> void
{
fair::Logger::SetConsoleSeverity("debug");
fair::Logger::DefineVerbosity("user1",
@@ -23,35 +23,24 @@ auto session_test() -> void
fair::VerbositySpec::Info::severity));
fair::Logger::SetVerbosity("user1");
fair::Logger::SetConsoleColor();
}
TEST(DDS, Environment)
{
setup();
fair::mq::sdk::DDSEnvironment env(CMAKE_CURRENT_BINARY_DIR);
LOG(debug) << env;
{
fair::mq::sdk::DDSSession session(env);
LOG(debug) << session;
session.SubmitAgents(5);
session.SubmitAgents(5);
}
{
fair::mq::sdk::DDSSession session(env);
LOG(debug) << session;
session.SubmitAgents(5);
}
{
fair::mq::sdk::DDSSession session(env);
LOG(debug) << session;
session.SubmitAgents(5);
}
}
TEST(DDS, Session)
{
session_test();
}
setup();
TEST(DDS, Session2)
{
session_test();
fair::mq::sdk::DDSEnvironment env(CMAKE_CURRENT_BINARY_DIR);
fair::mq::sdk::DDSSession session(env);
session.StopOnDestruction();
LOG(debug) << session;
}
} // namespace

18
test/sdk/_topology.cxx
View File

@@ -8,7 +8,9 @@
#include "TopologyFixture.h"
#include <DDS/Topology.h>
#include <fairmq/sdk/Topology.h>
#include <fairmq/Tools.h>
namespace {
@@ -16,7 +18,21 @@ using Topology = fair::mq::test::TopologyFixture;
TEST_F(Topology, Construction)
{
fair::mq::sdk::Topology topo(mDDSTopology);
fair::mq::sdk::Topology topo(mDDSTopo, mDDSSession);
}
TEST_F(Topology, ChangeState)
{
using fair::mq::sdk::Topology;
using fair::mq::sdk::TopologyTransition;
Topology topo(mDDSTopo, mDDSSession);
fair::mq::tools::Semaphore blocker;
topo.ChangeState(TopologyTransition::Stop, [&](Topology::ChangeStateResult result) {
LOG(info) << result;
blocker.Signal();
});
blocker.Wait();
}
} // namespace