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

Add config plugin class.

Browse Source
This commit is contained in:
Alexey Rybalchenko
2019-05-29 17:08:20 +02:00
committed by Dennis Klein
parent bf8ec968e7
commit cba6d19781
109 changed files with 1393 additions and 1433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/device/_config.cxx
View File

@@ -7,7 +7,7 @@
********************************************************************************/
#include <FairMQDevice.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <fairmq/Tools.h>
@@ -97,15 +97,13 @@ class Config : public ::testing::Test
string TestDeviceSetConfig(const string& transport)
{
FairMQProgOptions config;
fair::mq::ProgOptions config;
vector<string> emptyArgs = {"dummy", "--id", "test", "--color", "false"};
if (config.ParseAll(emptyArgs, true)) {
return 0;
}
config.ParseAll(emptyArgs, true);
config.SetValue<string>("transport", transport);
config.SetProperty("transport", transport);
FairMQDevice device;
device.SetConfig(config);

4
test/helper/devices/TestPollIn.h
View File

@@ -11,7 +11,7 @@
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <thread>
namespace fair
@@ -33,7 +33,7 @@ class PollIn : public FairMQDevice
protected:
auto InitTask() -> void override
{
fPollType = fConfig->GetValue<int>("poll-type");
fPollType = fConfig->GetProperty<int>("poll-type");
std::this_thread::sleep_for(std::chrono::milliseconds(200));
}

4
test/helper/runTestDevice.cxx
View File

@@ -36,12 +36,12 @@ auto addCustomOptions(bpo::options_description& options) -> void
("poll-type", bpo::value<int>()->default_value(0), "Poll type switch(0 - vector of (sub-)channels, 1 - vector of channel names)");
}
auto getDevice(const FairMQProgOptions& config) -> FairMQDevicePtr
auto getDevice(const fair::mq::ProgOptions& config) -> FairMQDevicePtr
{
using namespace std;
using namespace fair::mq::test;
auto id = config.GetValue<std::string>("id");
auto id = config.GetProperty<std::string>("id");
if (0 == id.find("pull_")) {
return new Pull;

10
test/message/_message.cxx
View File

@@ -9,7 +9,7 @@
#include <FairMQChannel.h>
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <fairmq/Tools.h>
#include <gtest/gtest.h>
@@ -25,8 +25,8 @@ void RunPushPullWithMsgResize(const string& transport, const string& address)
{
size_t session{fair::mq::tools::UuidHash()};
FairMQProgOptions config;
config.SetValue<string>("session", to_string(session));
fair::mq::ProgOptions config;
config.SetProperty<string>("session", to_string(session));
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
@@ -57,8 +57,8 @@ void RunMsgRebuild(const string& transport)
{
size_t session{fair::mq::tools::UuidHash()};
FairMQProgOptions config;
config.SetValue<string>("session", to_string(session));
fair::mq::ProgOptions config;
config.SetProperty<string>("session", to_string(session));
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);

4
test/plugin_services/Fixture.h
View File

@@ -12,7 +12,7 @@
#include <gtest/gtest.h>
#include <fairmq/PluginServices.h>
#include <FairMQDevice.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <memory>
#include <thread>
@@ -58,7 +58,7 @@ struct PluginServices : ::testing::Test {
}
}
FairMQProgOptions mConfig;
fair::mq::ProgOptions mConfig;
FairMQDevice mDevice;
fair::mq::PluginServices mServices;
std::thread fRunStateMachineThread;

2
test/plugin_services/_config.cxx
View File

@@ -50,7 +50,7 @@ TEST_F(PluginServices, ConfigInvalidStateError)
TEST_F(PluginServices, KeyDiscovery)
{
mConfig.SetValue("foo", 0);
mConfig.SetProperty("foo", 0);
auto keys(mServices.GetPropertyKeys());

6
test/plugins/_plugin.cxx
View File

@@ -11,7 +11,7 @@
#include <fairmq/PluginServices.h>
#include <fairmq/Tools.h>
#include <FairMQDevice.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <memory>
#include <sstream>
#include <string>
@@ -44,7 +44,7 @@ auto control(FairMQDevice& device) -> void
TEST(Plugin, Operators)
{
FairMQProgOptions config;
fair::mq::ProgOptions config;
FairMQDevice device;
PluginServices services{config, device};
Plugin p1{"dds", {1, 0, 0}, "Foo Bar <foo.bar@test.net>", "https://git.test.net/dds.git", &services};
@@ -61,7 +61,7 @@ TEST(Plugin, Operators)
TEST(Plugin, OstreamOperators)
{
FairMQProgOptions config;
fair::mq::ProgOptions config;
FairMQDevice device;
PluginServices services{config, device};
Plugin p1{"dds", {1, 0, 0}, "Foo Bar <foo.bar@test.net>", "https://git.test.net/dds.git", &services};

10
test/plugins/_plugin_manager.cxx
View File

@@ -10,7 +10,7 @@
#include <fairmq/PluginManager.h>
#include <fairmq/PluginServices.h>
#include <FairMQDevice.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <FairMQLogger.h>
#include <fstream>
#include <memory>
@@ -45,7 +45,7 @@ auto control(FairMQDevice& device) -> void
TEST(PluginManager, LoadPluginDynamic)
{
FairMQProgOptions config;
fair::mq::ProgOptions config;
FairMQDevice device;
PluginManager mgr;
mgr.EmplacePluginServices(config, device);
@@ -83,9 +83,9 @@ TEST(PluginManager, LoadPluginStatic)
ASSERT_NO_THROW(mgr.LoadPlugin("s:control"));
FairMQProgOptions config;
config.SetValue<string>("control", "static");
config.SetValue("catch-signals", 0);
fair::mq::ProgOptions config;
config.SetProperty<string>("control", "static");
config.SetProperty("catch-signals", 0);
mgr.EmplacePluginServices(config, device);
ASSERT_NO_THROW(mgr.InstantiatePlugins());

14
test/protocols/_push_pull_multipart.cxx
View File

@@ -12,7 +12,7 @@
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <fairmq/Tools.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <algorithm>
#include <memory>
@@ -29,8 +29,8 @@ auto RunSingleThreadedMultipart(string transport, string address) -> void {
size_t session{fair::mq::tools::UuidHash()};
FairMQProgOptions config;
config.SetValue<string>("session", std::to_string(session));
fair::mq::ProgOptions config;
config.SetProperty<string>("session", std::to_string(session));
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
FairMQTransportFactory* factoryptr = factory.get();
auto push = FairMQChannel{"Push", "push", factory};
@@ -67,10 +67,10 @@ auto RunMultiThreadedMultipart(string transport, string address) -> void
{
size_t session{fair::mq::tools::UuidHash()};
FairMQProgOptions config;
config.SetValue<string>("session", std::to_string(session));
config.SetValue<int>("io-threads", 1);
config.SetValue<size_t>("shm-segment-size", 20000000);
fair::mq::ProgOptions config;
config.SetProperty<string>("session", std::to_string(session));
config.SetProperty<int>("io-threads", 1);
config.SetProperty<size_t>("shm-segment-size", 20000000);
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
auto push = FairMQChannel{"Push", "push", factory};
ASSERT_TRUE(push.Bind(address));

6
test/transport/_options.cxx
View File

@@ -12,7 +12,7 @@
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <fairmq/Tools.h>
#include <options/FairMQProgOptions.h>
#include <fairmq/ProgOptions.h>
#include <algorithm>
#include <memory>
@@ -43,8 +43,8 @@ void RunOptionsTest(const string& transport)
{
size_t session{fair::mq::tools::UuidHash()};
FairMQProgOptions config;
config.SetValue<string>("session", to_string(session));
fair::mq::ProgOptions config;
config.SetProperty<string>("session", to_string(session));
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
FairMQChannel channel("Push", "push", factory);