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

Don't use to-be-deprecated names

Browse Source
This commit is contained in:
Alexey Rybalchenko
2022-01-14 00:48:34 +01:00
committed by Dennis Klein
parent f15f669853
commit bfd08bb33f
90 changed files with 411 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_ERROR_STATE_H
#define FAIR_MQ_TEST_ERROR_STATE_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <iostream>

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_EXCEPTIONS_H
#define FAIR_MQ_TEST_EXCEPTIONS_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <iostream>
#include <stdexcept>

2
test/helper/devices/TestPairLeft.h
View File

@@ -9,7 +9,7 @@
#ifndef FAIR_MQ_TEST_PAIRLEFT_H
#define FAIR_MQ_TEST_PAIRLEFT_H
#include <FairMQDevice.h>
#include <fairmq/Device.h>
#include <cstddef>
#include <thread>

2
test/helper/devices/TestPairRight.h
View File

@@ -9,7 +9,7 @@
#ifndef FAIR_MQ_TEST_PAIRRIGHT_H
#define FAIR_MQ_TEST_PAIRRIGHT_H
#include <FairMQDevice.h>
#include <fairmq/Device.h>
#include <cstddef>
#include <string>
#include <thread>

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

@@ -9,17 +9,20 @@
#ifndef FAIR_MQ_TEST_POLLIN_H
#define FAIR_MQ_TEST_POLLIN_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairmq/ProgOptions.h>
#include <fairlogger/Logger.h>
#include <thread>
namespace fair::mq::test
{
using namespace std;
using namespace fair::mq;
class PollIn : public FairMQDevice
class PollIn : public Device
{
public:
PollIn()
@@ -35,12 +38,12 @@ class PollIn : public FairMQDevice
auto Run() -> void override
{
vector<FairMQChannel*> chans;
vector<Channel*> chans;
chans.push_back(&GetChannel("data1", 0));
chans.push_back(&GetChannel("data2", 0));
FairMQPollerPtr poller = nullptr;
PollerPtr poller = nullptr;
if (fPollType == 0)
{
@@ -59,8 +62,8 @@ class PollIn : public FairMQDevice
bool arrived2 = false;
bool bothArrived = false;
FairMQMessagePtr msg1(NewMessage());
FairMQMessagePtr msg2(NewMessage());
MessagePtr msg1(NewMessage());
MessagePtr msg2(NewMessage());
while (!bothArrived)
{

2
test/helper/devices/TestPollOut.h
View File

@@ -9,7 +9,7 @@
#ifndef FAIR_MQ_TEST_POLLOUT_H
#define FAIR_MQ_TEST_POLLOUT_H
#include <FairMQDevice.h>
#include <fairmq/Device.h>
#include <thread>
namespace fair::mq::test

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_PUB_H
#define FAIR_MQ_TEST_PUB_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <chrono>
#include <thread>

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_PULL_H
#define FAIR_MQ_TEST_PULL_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <thread>
namespace fair::mq::test

2
test/helper/devices/TestPush.h
View File

@@ -9,7 +9,7 @@
#ifndef FAIR_MQ_TEST_PUSH_H
#define FAIR_MQ_TEST_PUSH_H
#include <FairMQDevice.h>
#include <fairmq/Device.h>
#include <thread>
namespace fair::mq::test

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_REP_H
#define FAIR_MQ_TEST_REP_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <thread>
namespace fair::mq::test

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_REQ_H
#define FAIR_MQ_TEST_REQ_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <thread>
namespace fair::mq::test

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_SIGNALS_H
#define FAIR_MQ_TEST_SIGNALS_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <iostream>
#include <csignal>

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_SUB_H
#define FAIR_MQ_TEST_SUB_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <chrono>
#include <thread>

21
test/helper/devices/TestTransferTimeout.h
View File

@@ -9,13 +9,16 @@
#ifndef FAIR_MQ_TEST_TRANSFERTIMEOUT_H
#define FAIR_MQ_TEST_TRANSFERTIMEOUT_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
namespace fair::mq::test
{
class TransferTimeout : public FairMQDevice
using namespace fair::mq;
class TransferTimeout : public Device
{
protected:
auto Run() -> void override
@@ -38,8 +41,8 @@ class TransferTimeout : public FairMQDevice
bool send2PartsCancelingAfter0ms = false;
bool receive2PartsCancelingAfter0ms = false;
FairMQMessagePtr msg1(NewMessage());
FairMQMessagePtr msg2(NewMessage());
MessagePtr msg1(NewMessage());
MessagePtr msg2(NewMessage());
if (Send(msg1, "data-out", 0, 200) == static_cast<int>(TransferCode::timeout)) {
LOG(info) << "send msg canceled (200ms)";
@@ -69,9 +72,9 @@ class TransferTimeout : public FairMQDevice
LOG(error) << "receive msg did not cancel (0ms)";
}
FairMQParts parts1;
Parts parts1;
parts1.AddPart(NewMessage(10));
FairMQParts parts2;
Parts parts2;
if (Send(parts1, "data-out", 0, 200) == static_cast<int>(TransferCode::timeout)) {
LOG(info) << "send 1 part canceled (200ms)";
@@ -101,10 +104,10 @@ class TransferTimeout : public FairMQDevice
LOG(error) << "receive 1 part did not cancel (0ms)";
}
FairMQParts parts3;
Parts parts3;
parts3.AddPart(NewMessage(10));
parts3.AddPart(NewMessage(10));
FairMQParts parts4;
Parts parts4;
if (Send(parts3, "data-out", 0, 200) == static_cast<int>(TransferCode::timeout)) {
LOG(info) << "send 2 parts canceled (200ms)";

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

@@ -9,8 +9,8 @@
#ifndef FAIR_MQ_TEST_WAITFOR_H
#define FAIR_MQ_TEST_WAITFOR_H
#include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <fairmq/Device.h>
#include <fairlogger/Logger.h>
#include <iostream>