mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-13 08:41:16 +00:00
f1abb9ecdd
- Remove the compile time check of the transport implementation.
The transport (zeromq/nanomsg) can be chosen at run time with:
`device.SetTransport("zeromq"); // possible values are "zeromq" and "nanomsg"`.
For devices that use FairMQProgOptions, the transport can be configured via cmd option:
`--transport zeromq` or `--transport nanomsg`. Default values is "zeromq".
The device receives the configured value with:
`device.SetTransport(config.GetValue<std::string>("transport"));`
Old method of setting transport still works. But the NANOMSG constant is not defined.
- Remove old `fairmq/prototest` directory. It was only used as a test for protobuf.
The protobuf part of Tutorial3 does the same (with different values).
- Fix a bug in FairMQPollerNN, where the `revents` value was not initialized.
This caused the `poller->CheckOutput()` to trigger when it should not.
48 lines
1.5 KiB
C++
48 lines
1.5 KiB
C++
/********************************************************************************
|
|
* Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
|
|
* *
|
|
* This software is distributed under the terms of the *
|
|
* GNU Lesser General Public Licence version 3 (LGPL) version 3, *
|
|
* copied verbatim in the file "LICENSE" *
|
|
********************************************************************************/
|
|
/**
|
|
* runTestPull.cxx
|
|
*
|
|
* @since 2015-09-05
|
|
* @author A. Rybalchenko
|
|
*/
|
|
|
|
#include "FairMQLogger.h"
|
|
#include "FairMQTestPull.h"
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
FairMQTestPull testPull;
|
|
testPull.CatchSignals();
|
|
testPull.SetTransport("zeromq");
|
|
|
|
testPull.SetProperty(FairMQTestPull::Id, "testPull");
|
|
|
|
FairMQChannel pullChannel("pull", "connect", "tcp://127.0.0.1:5557");
|
|
testPull.fChannels["data"].push_back(pullChannel);
|
|
|
|
testPull.ChangeState("INIT_DEVICE");
|
|
testPull.WaitForEndOfState("INIT_DEVICE");
|
|
|
|
testPull.ChangeState("INIT_TASK");
|
|
testPull.WaitForEndOfState("INIT_TASK");
|
|
|
|
testPull.ChangeState("RUN");
|
|
testPull.WaitForEndOfState("RUN");
|
|
|
|
testPull.ChangeState("RESET_TASK");
|
|
testPull.WaitForEndOfState("RESET_TASK");
|
|
|
|
testPull.ChangeState("RESET_DEVICE");
|
|
testPull.WaitForEndOfState("RESET_DEVICE");
|
|
|
|
testPull.ChangeState("END");
|
|
|
|
return 0;
|
|
}
|