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.
56 lines
1.9 KiB
C++
56 lines
1.9 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" *
|
|
********************************************************************************/
|
|
/**
|
|
* FairMQPollerZMQ.h
|
|
*
|
|
* @since 2014-01-23
|
|
* @author A. Rybalchenko
|
|
*/
|
|
|
|
#ifndef FAIRMQPOLLERZMQ_H_
|
|
#define FAIRMQPOLLERZMQ_H_
|
|
|
|
#include <vector>
|
|
#include <unordered_map>
|
|
#include <initializer_list>
|
|
|
|
#include "FairMQPoller.h"
|
|
#include "FairMQChannel.h"
|
|
#include "FairMQTransportFactoryZMQ.h"
|
|
|
|
class FairMQChannel;
|
|
|
|
class FairMQPollerZMQ : public FairMQPoller
|
|
{
|
|
friend class FairMQChannel;
|
|
friend class FairMQTransportFactoryZMQ;
|
|
|
|
public:
|
|
FairMQPollerZMQ(const std::vector<FairMQChannel>& channels);
|
|
FairMQPollerZMQ(std::unordered_map<std::string, std::vector<FairMQChannel>>& channelsMap, std::initializer_list<std::string> channelList);
|
|
FairMQPollerZMQ(const FairMQPollerZMQ&) = delete;
|
|
FairMQPollerZMQ operator=(const FairMQPollerZMQ&) = delete;
|
|
|
|
virtual void Poll(const int timeout);
|
|
virtual bool CheckInput(const int index);
|
|
virtual bool CheckOutput(const int index);
|
|
virtual bool CheckInput(const std::string channelKey, const int index);
|
|
virtual bool CheckOutput(const std::string channelKey, const int index);
|
|
|
|
virtual ~FairMQPollerZMQ();
|
|
|
|
private:
|
|
FairMQPollerZMQ(FairMQSocket& cmdSocket, FairMQSocket& dataSocket);
|
|
|
|
zmq_pollitem_t* items;
|
|
int fNumItems;
|
|
|
|
std::unordered_map<std::string, int> fOffsetMap;
|
|
};
|
|
|
|
#endif /* FAIRMQPOLLERZMQ_H_ */ |