mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 17:41:45 +00:00
fix: First round of using new non-namespaced typenames
This commit is contained in:
Dennis Klein
@@ -1,20 +1,19 @@
|
||||
/********************************************************************************
|
||||
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
|
||||
* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
|
||||
* *
|
||||
* This software is distributed under the terms of the *
|
||||
* GNU Lesser General Public Licence (LGPL) version 3, *
|
||||
* copied verbatim in the file "LICENSE" *
|
||||
********************************************************************************/
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include <FairMQChannel.h>
|
||||
#include <FairMQParts.h>
|
||||
#include <FairMQLogger.h>
|
||||
#include <FairMQTransportFactory.h>
|
||||
#include <fairmq/tools/Unique.h>
|
||||
#include <fairmq/ProgOptions.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <fairlogger/Logger.h>
|
||||
#include <fairmq/Channel.h>
|
||||
#include <fairmq/Parts.h>
|
||||
#include <fairmq/ProgOptions.h>
|
||||
#include <fairmq/TransportFactory.h>
|
||||
#include <fairmq/tools/Unique.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
@@ -24,23 +23,22 @@ namespace
|
||||
{
|
||||
|
||||
using namespace std;
|
||||
using namespace fair::mq;
|
||||
|
||||
auto RunSingleThreadedMultipart(string transport, string address1, string address2) -> void {
|
||||
|
||||
size_t session{fair::mq::tools::UuidHash()};
|
||||
|
||||
fair::mq::ProgOptions config;
|
||||
config.SetProperty<string>("session", std::to_string(session));
|
||||
config.SetProperty<string>("session", tools::Uuid());
|
||||
|
||||
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
|
||||
auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config);
|
||||
|
||||
FairMQChannel push1("Push1", "push", factory);
|
||||
Channel push1("Push1", "push", factory);
|
||||
ASSERT_TRUE(push1.Bind(address1));
|
||||
FairMQChannel pull1("Pull1", "pull", factory);
|
||||
Channel pull1("Pull1", "pull", factory);
|
||||
ASSERT_TRUE(pull1.Connect(address1));
|
||||
FairMQChannel push2("Push2", "push", factory);
|
||||
Channel push2("Push2", "push", factory);
|
||||
ASSERT_TRUE(push2.Bind(address2));
|
||||
FairMQChannel pull2("Pull2", "pull", factory);
|
||||
Channel pull2("Pull2", "pull", factory);
|
||||
ASSERT_TRUE(pull2.Connect(address2));
|
||||
|
||||
// TODO validate that fTransportFactory is not nullptr
|
||||
@@ -51,32 +49,32 @@ auto RunSingleThreadedMultipart(string transport, string address1, string addres
|
||||
ASSERT_TRUE(pull2.Validate());
|
||||
|
||||
{
|
||||
FairMQParts multiplePartsOut;
|
||||
Parts multiplePartsOut;
|
||||
multiplePartsOut.AddPart(push1.NewSimpleMessage("1"));
|
||||
multiplePartsOut.AddPart(push1.NewSimpleMessage("2"));
|
||||
multiplePartsOut.AddPart(push1.NewSimpleMessage("3"));
|
||||
ASSERT_GE(push1.Send(multiplePartsOut), 0);
|
||||
|
||||
FairMQParts singlePartOut;
|
||||
Parts singlePartOut;
|
||||
singlePartOut.AddPart(push1.NewSimpleMessage("4"));
|
||||
ASSERT_GE(push1.Send(singlePartOut), 0);
|
||||
}
|
||||
|
||||
FairMQParts multipleParts;
|
||||
Parts multipleParts;
|
||||
ASSERT_GE(pull1.Receive(multipleParts), 0);
|
||||
|
||||
stringstream multiple;
|
||||
for_each(multipleParts.cbegin(), multipleParts.cend(), [&multiple, &factory](const FairMQMessagePtr& part) {
|
||||
for_each(multipleParts.cbegin(), multipleParts.cend(), [&multiple, &factory](const MessagePtr& part) {
|
||||
multiple << string{static_cast<char*>(part->GetData()), part->GetSize()};
|
||||
ASSERT_EQ(part->GetTransport(), factory.get());
|
||||
});
|
||||
ASSERT_EQ(multiple.str(), "123");
|
||||
|
||||
FairMQParts singlePart;
|
||||
Parts singlePart;
|
||||
ASSERT_GE(pull1.Receive(singlePart), 0);
|
||||
|
||||
stringstream single;
|
||||
for_each(singlePart.cbegin(), singlePart.cend(), [&single](const FairMQMessagePtr& part) {
|
||||
for_each(singlePart.cbegin(), singlePart.cend(), [&single](const MessagePtr& part) {
|
||||
single << string{static_cast<char*>(part->GetData()), part->GetSize()};
|
||||
});
|
||||
ASSERT_EQ(single.str(), "4");
|
||||
@@ -85,18 +83,18 @@ auto RunSingleThreadedMultipart(string transport, string address1, string addres
|
||||
ASSERT_GE(push2.Send(multipleParts), 0);
|
||||
|
||||
{
|
||||
FairMQParts singlePartIn;
|
||||
Parts singlePartIn;
|
||||
ASSERT_GE(pull2.Receive(singlePartIn), 0);
|
||||
stringstream singleIn;
|
||||
for_each(singlePartIn.cbegin(), singlePartIn.cend(), [&singleIn](const FairMQMessagePtr& part) {
|
||||
for_each(singlePartIn.cbegin(), singlePartIn.cend(), [&singleIn](const MessagePtr& part) {
|
||||
singleIn << string{static_cast<char*>(part->GetData()), part->GetSize()};
|
||||
});
|
||||
ASSERT_EQ(singleIn.str(), "4");
|
||||
|
||||
FairMQParts multiplePartsIn;
|
||||
Parts multiplePartsIn;
|
||||
ASSERT_GE(pull2.Receive(multiplePartsIn), 0);
|
||||
stringstream multipleIn;
|
||||
for_each(multiplePartsIn.cbegin(), multiplePartsIn.cend(), [&multipleIn, &factory](const FairMQMessagePtr& part) {
|
||||
for_each(multiplePartsIn.cbegin(), multiplePartsIn.cend(), [&multipleIn, &factory](const MessagePtr& part) {
|
||||
multipleIn << string{static_cast<char*>(part->GetData()), part->GetSize()};
|
||||
ASSERT_EQ(part->GetTransport(), factory.get());
|
||||
});
|
||||
@@ -106,24 +104,22 @@ auto RunSingleThreadedMultipart(string transport, string address1, string addres
|
||||
|
||||
auto RunMultiThreadedMultipart(string transport, string address1) -> void
|
||||
{
|
||||
size_t session{fair::mq::tools::UuidHash()};
|
||||
|
||||
fair::mq::ProgOptions config;
|
||||
config.SetProperty<string>("session", std::to_string(session));
|
||||
ProgOptions config;
|
||||
config.SetProperty<string>("session", tools::Uuid());
|
||||
config.SetProperty<int>("io-threads", 1);
|
||||
config.SetProperty<size_t>("shm-segment-size", 20000000);
|
||||
config.SetProperty<size_t>("shm-segment-size", 20000000); // NOLINT
|
||||
|
||||
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
|
||||
auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config);
|
||||
|
||||
FairMQChannel push1("Push1", "push", factory);
|
||||
Channel push1("Push1", "push", factory);
|
||||
ASSERT_TRUE(push1.Bind(address1));
|
||||
FairMQChannel pull1("Pull1", "pull", factory);
|
||||
Channel pull1("Pull1", "pull", factory);
|
||||
ASSERT_TRUE(pull1.Connect(address1));
|
||||
|
||||
auto pusher = thread{[&push1](){
|
||||
ASSERT_TRUE(push1.Validate());
|
||||
|
||||
FairMQParts sent;
|
||||
Parts sent;
|
||||
sent.AddPart(push1.NewSimpleMessage("1"));
|
||||
sent.AddPart(push1.NewSimpleMessage("2"));
|
||||
sent.AddPart(push1.NewSimpleMessage("3"));
|
||||
@@ -134,11 +130,11 @@ auto RunMultiThreadedMultipart(string transport, string address1) -> void
|
||||
auto puller = thread{[&pull1](){
|
||||
ASSERT_TRUE(pull1.Validate());
|
||||
|
||||
FairMQParts received;
|
||||
Parts received;
|
||||
ASSERT_GE(pull1.Receive(received), 0);
|
||||
|
||||
stringstream out;
|
||||
for_each(received.cbegin(), received.cend(), [&out](const FairMQMessagePtr& part) {
|
||||
for_each(received.cbegin(), received.cend(), [&out](const MessagePtr& part) {
|
||||
out << string{static_cast<char*>(part->GetData()), part->GetSize()};
|
||||
});
|
||||
ASSERT_EQ(out.str(), "123");
|
||||
@@ -148,42 +144,42 @@ auto RunMultiThreadedMultipart(string transport, string address1) -> void
|
||||
puller.join();
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_ST_inproc_zeromq)
|
||||
TEST(PushPull, Multipart_ST_inproc_zeromq) // NOLINT
|
||||
{
|
||||
RunSingleThreadedMultipart("zeromq", "inproc://test1", "inproc://test2");
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_ST_inproc_shmem)
|
||||
TEST(PushPull, Multipart_ST_inproc_shmem) // NOLINT
|
||||
{
|
||||
RunSingleThreadedMultipart("shmem", "inproc://test1", "inproc://test2");
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_ST_ipc_zeromq)
|
||||
TEST(PushPull, Multipart_ST_ipc_zeromq) // NOLINT
|
||||
{
|
||||
RunSingleThreadedMultipart("zeromq", "ipc://test_Multipart_ST_ipc_zeromq_1", "ipc://test_Multipart_ST_ipc_zeromq_2");
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_ST_ipc_shmem)
|
||||
TEST(PushPull, Multipart_ST_ipc_shmem) // NOLINT
|
||||
{
|
||||
RunSingleThreadedMultipart("shmem", "ipc://test_Multipart_ST_ipc_shmem_1", "ipc://test_Multipart_ST_ipc_shmem_2");
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_MT_inproc_zeromq)
|
||||
TEST(PushPull, Multipart_MT_inproc_zeromq) // NOLINT
|
||||
{
|
||||
RunMultiThreadedMultipart("zeromq", "inproc://test_1");
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_MT_inproc_shmem)
|
||||
TEST(PushPull, Multipart_MT_inproc_shmem) // NOLINT
|
||||
{
|
||||
RunMultiThreadedMultipart("shmem", "inproc://test_1");
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_MT_ipc_zeromq)
|
||||
TEST(PushPull, Multipart_MT_ipc_zeromq) // NOLINT
|
||||
{
|
||||
RunMultiThreadedMultipart("zeromq", "ipc://test_Multipart_MT_ipc_zeromq_1");
|
||||
}
|
||||
|
||||
TEST(PushPull, Multipart_MT_ipc_shmem)
|
||||
TEST(PushPull, Multipart_MT_ipc_shmem) // NOLINT
|
||||
{
|
||||
RunMultiThreadedMultipart("shmem", "ipc://test_Multipart_MT_ipc_shmem_1");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user