mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-13 16:46:47 +00:00
Zmq: refactor to use namespaces
This commit is contained in:
parent
df574c6466
commit
361fb0cba5
|
@ -191,11 +191,11 @@ if(BUILD_FAIRMQ)
|
||||||
shmem/Manager.h
|
shmem/Manager.h
|
||||||
shmem/Region.h
|
shmem/Region.h
|
||||||
zeromq/Context.h
|
zeromq/Context.h
|
||||||
zeromq/FairMQMessageZMQ.h
|
zeromq/Message.h
|
||||||
zeromq/FairMQPollerZMQ.h
|
zeromq/Poller.h
|
||||||
zeromq/FairMQUnmanagedRegionZMQ.h
|
zeromq/UnmanagedRegion.h
|
||||||
zeromq/FairMQSocketZMQ.h
|
zeromq/Socket.h
|
||||||
zeromq/FairMQTransportFactoryZMQ.h
|
zeromq/TransportFactory.h
|
||||||
)
|
)
|
||||||
|
|
||||||
if(BUILD_OFI_TRANSPORT)
|
if(BUILD_OFI_TRANSPORT)
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include <FairMQTransportFactory.h>
|
#include <FairMQTransportFactory.h>
|
||||||
#include <fairmq/shmem/TransportFactory.h>
|
#include <fairmq/shmem/TransportFactory.h>
|
||||||
#include <zeromq/FairMQTransportFactoryZMQ.h>
|
#include <fairmq/zeromq/TransportFactory.h>
|
||||||
#ifdef BUILD_OFI_TRANSPORT
|
#ifdef BUILD_OFI_TRANSPORT
|
||||||
#include <fairmq/ofi/TransportFactory.h>
|
#include <fairmq/ofi/TransportFactory.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -36,7 +36,7 @@ auto FairMQTransportFactory::CreateTransportFactory(const string& type,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type == "zeromq") {
|
if (type == "zeromq") {
|
||||||
return make_shared<FairMQTransportFactoryZMQ>(finalId, config);
|
return make_shared<fair::mq::zmq::TransportFactory>(finalId, config);
|
||||||
} else if (type == "shmem") {
|
} else if (type == "shmem") {
|
||||||
return make_shared<fair::mq::shmem::TransportFactory>(finalId, config);
|
return make_shared<fair::mq::shmem::TransportFactory>(finalId, config);
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,13 +56,13 @@ class Context
|
||||||
throw ContextError(tools::ToString("failed configuring context, reason: ", zmq_strerror(errno)));
|
throw ContextError(tools::ToString("failed configuring context, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
|
|
||||||
fRegionEvents.emplace(0, nullptr, 0, 0, fair::mq::RegionEvent::local_only);
|
fRegionEvents.emplace(0, nullptr, 0, 0, RegionEvent::local_only);
|
||||||
}
|
}
|
||||||
|
|
||||||
Context(const Context&) = delete;
|
Context(const Context&) = delete;
|
||||||
Context operator=(const Context&) = delete;
|
Context operator=(const Context&) = delete;
|
||||||
|
|
||||||
void SubscribeToRegionEvents(FairMQRegionEventCallback callback)
|
void SubscribeToRegionEvents(RegionEventCallback callback)
|
||||||
{
|
{
|
||||||
if (fRegionEventThread.joinable()) {
|
if (fRegionEventThread.joinable()) {
|
||||||
LOG(debug) << "Already subscribed. Overwriting previous subscription.";
|
LOG(debug) << "Already subscribed. Overwriting previous subscription.";
|
||||||
|
@ -108,7 +108,7 @@ class Context
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<fair::mq::RegionInfo> GetRegionInfo() const
|
std::vector<RegionInfo> GetRegionInfo() const
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(fMtx);
|
std::lock_guard<std::mutex> lock(fMtx);
|
||||||
return fRegionInfos;
|
return fRegionInfos;
|
||||||
|
@ -120,7 +120,7 @@ class Context
|
||||||
return fRegionCounter;
|
return fRegionCounter;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddRegion(uint64_t id, void* ptr, size_t size, int64_t userFlags, fair::mq::RegionEvent event)
|
void AddRegion(uint64_t id, void* ptr, size_t size, int64_t userFlags, RegionEvent event)
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(fMtx);
|
std::lock_guard<std::mutex> lock(fMtx);
|
||||||
|
@ -135,12 +135,12 @@ class Context
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(fMtx);
|
std::lock_guard<std::mutex> lock(fMtx);
|
||||||
auto it = find_if(fRegionInfos.begin(), fRegionInfos.end(), [id](const fair::mq::RegionInfo& i) {
|
auto it = find_if(fRegionInfos.begin(), fRegionInfos.end(), [id](const RegionInfo& i) {
|
||||||
return i.id == id;
|
return i.id == id;
|
||||||
});
|
});
|
||||||
if (it != fRegionInfos.end()) {
|
if (it != fRegionInfos.end()) {
|
||||||
fRegionEvents.push(*it);
|
fRegionEvents.push(*it);
|
||||||
fRegionEvents.back().event = fair::mq::RegionEvent::destroyed;
|
fRegionEvents.back().event = RegionEvent::destroyed;
|
||||||
fRegionInfos.erase(it);
|
fRegionInfos.erase(it);
|
||||||
} else {
|
} else {
|
||||||
LOG(error) << "RemoveRegion: given id (" << id << ") not found.";
|
LOG(error) << "RemoveRegion: given id (" << id << ") not found.";
|
||||||
|
@ -181,10 +181,10 @@ class Context
|
||||||
|
|
||||||
uint64_t fRegionCounter;
|
uint64_t fRegionCounter;
|
||||||
std::condition_variable fRegionEventsCV;
|
std::condition_variable fRegionEventsCV;
|
||||||
std::vector<fair::mq::RegionInfo> fRegionInfos;
|
std::vector<RegionInfo> fRegionInfos;
|
||||||
std::queue<fair::mq::RegionInfo> fRegionEvents;
|
std::queue<RegionInfo> fRegionEvents;
|
||||||
std::thread fRegionEventThread;
|
std::thread fRegionEventThread;
|
||||||
std::function<void(fair::mq::RegionInfo)> fRegionEventCallback;
|
std::function<void(RegionInfo)> fRegionEventCallback;
|
||||||
bool fRegionEventsSubscriptionActive;
|
bool fRegionEventsSubscriptionActive;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,93 +0,0 @@
|
||||||
/********************************************************************************
|
|
||||||
* Copyright (C) 2014 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" *
|
|
||||||
********************************************************************************/
|
|
||||||
/**
|
|
||||||
* FairMQTransportFactoryZMQ.h
|
|
||||||
*
|
|
||||||
* @since 2014-01-20
|
|
||||||
* @author: A. Rybalchenko
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef FAIRMQTRANSPORTFACTORYZMQ_H_
|
|
||||||
#define FAIRMQTRANSPORTFACTORYZMQ_H_
|
|
||||||
|
|
||||||
#include <fairmq/zeromq/Context.h>
|
|
||||||
#include <fairmq/Tools.h>
|
|
||||||
#include <fairmq/ProgOptions.h>
|
|
||||||
#include <FairMQTransportFactory.h>
|
|
||||||
#include "FairMQMessageZMQ.h"
|
|
||||||
#include "FairMQSocketZMQ.h"
|
|
||||||
#include "FairMQPollerZMQ.h"
|
|
||||||
#include "FairMQUnmanagedRegionZMQ.h"
|
|
||||||
|
|
||||||
#include <memory> // unique_ptr
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
class FairMQTransportFactoryZMQ final : public FairMQTransportFactory
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
FairMQTransportFactoryZMQ(const std::string& id = "", const fair::mq::ProgOptions* config = nullptr)
|
|
||||||
: FairMQTransportFactory(id)
|
|
||||||
, fCtx(nullptr)
|
|
||||||
{
|
|
||||||
int major, minor, patch;
|
|
||||||
zmq_version(&major, &minor, &patch);
|
|
||||||
LOG(debug) << "Transport: Using ZeroMQ library, version: " << major << "." << minor << "." << patch;
|
|
||||||
|
|
||||||
if (config) {
|
|
||||||
fCtx = fair::mq::tools::make_unique<fair::mq::zmq::Context>(config->GetProperty<int>("io-threads", 1));
|
|
||||||
} else {
|
|
||||||
LOG(debug) << "fair::mq::ProgOptions not available! Using defaults.";
|
|
||||||
fCtx = fair::mq::tools::make_unique<fair::mq::zmq::Context>(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FairMQTransportFactoryZMQ(const FairMQTransportFactoryZMQ&) = delete;
|
|
||||||
FairMQTransportFactoryZMQ operator=(const FairMQTransportFactoryZMQ&) = delete;
|
|
||||||
|
|
||||||
FairMQMessagePtr CreateMessage() override { return fair::mq::tools::make_unique<FairMQMessageZMQ>(this); }
|
|
||||||
FairMQMessagePtr CreateMessage(const size_t size) override { return fair::mq::tools::make_unique<FairMQMessageZMQ>(size, this); }
|
|
||||||
FairMQMessagePtr CreateMessage(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr) override { return fair::mq::tools::make_unique<FairMQMessageZMQ>(data, size, ffn, hint, this); }
|
|
||||||
FairMQMessagePtr CreateMessage(FairMQUnmanagedRegionPtr& region, void* data, const size_t size, void* hint = 0) override { return fair::mq::tools::make_unique<FairMQMessageZMQ>(region, data, size, hint, this); }
|
|
||||||
|
|
||||||
FairMQSocketPtr CreateSocket(const std::string& type, const std::string& name) override { return fair::mq::tools::make_unique<FairMQSocketZMQ>(*fCtx, type, name, GetId(), this); }
|
|
||||||
|
|
||||||
FairMQPollerPtr CreatePoller(const std::vector<FairMQChannel>& channels) const override { return fair::mq::tools::make_unique<FairMQPollerZMQ>(channels); }
|
|
||||||
FairMQPollerPtr CreatePoller(const std::vector<FairMQChannel*>& channels) const override { return fair::mq::tools::make_unique<FairMQPollerZMQ>(channels); }
|
|
||||||
FairMQPollerPtr CreatePoller(const std::unordered_map<std::string, std::vector<FairMQChannel>>& channelsMap, const std::vector<std::string>& channelList) const override { return fair::mq::tools::make_unique<FairMQPollerZMQ>(channelsMap, channelList); }
|
|
||||||
|
|
||||||
FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, FairMQRegionCallback callback, const std::string& path = "", int flags = 0) override { return CreateUnmanagedRegion(size, 0, callback, nullptr, path, flags); }
|
|
||||||
FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, FairMQRegionBulkCallback bulkCallback, const std::string& path = "", int flags = 0) override { return CreateUnmanagedRegion(size, 0, nullptr, bulkCallback, path, flags); }
|
|
||||||
FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, const int64_t userFlags, FairMQRegionCallback callback, const std::string& path = "", int flags = 0) override { return CreateUnmanagedRegion(size, userFlags, callback, nullptr, path, flags); }
|
|
||||||
FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, const int64_t userFlags, FairMQRegionBulkCallback bulkCallback, const std::string& path = "", int flags = 0) override { return CreateUnmanagedRegion(size, userFlags, nullptr, bulkCallback, path, flags); }
|
|
||||||
FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, const int64_t userFlags, FairMQRegionCallback callback, FairMQRegionBulkCallback bulkCallback, const std::string& path = "", int flags = 0)
|
|
||||||
{
|
|
||||||
auto ptr = std::unique_ptr<FairMQUnmanagedRegion>(new FairMQUnmanagedRegionZMQ(*fCtx, size, userFlags, callback, bulkCallback, path, flags, this));
|
|
||||||
auto zPtr = static_cast<FairMQUnmanagedRegionZMQ*>(ptr.get());
|
|
||||||
fCtx->AddRegion(zPtr->GetId(), zPtr->GetData(), zPtr->GetSize(), zPtr->GetUserFlags(), fair::mq::RegionEvent::created);
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SubscribeToRegionEvents(FairMQRegionEventCallback callback) override { fCtx->SubscribeToRegionEvents(callback); }
|
|
||||||
bool SubscribedToRegionEvents() override { return fCtx->SubscribedToRegionEvents(); }
|
|
||||||
void UnsubscribeFromRegionEvents() override { fCtx->UnsubscribeFromRegionEvents(); }
|
|
||||||
std::vector<fair::mq::RegionInfo> GetRegionInfo() override { return fCtx->GetRegionInfo(); }
|
|
||||||
|
|
||||||
fair::mq::Transport GetType() const override { return fair::mq::Transport::ZMQ; }
|
|
||||||
|
|
||||||
void Interrupt() override { fCtx->Interrupt(); }
|
|
||||||
void Resume() override { fCtx->Resume(); }
|
|
||||||
void Reset() override { fCtx->Reset(); }
|
|
||||||
|
|
||||||
~FairMQTransportFactoryZMQ() override { LOG(debug) << "Destroying ZeroMQ transport..."; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::unique_ptr<fair::mq::zmq::Context> fCtx;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* FAIRMQTRANSPORTFACTORYZMQ_H_ */
|
|
|
@ -6,11 +6,11 @@
|
||||||
* copied verbatim in the file "LICENSE" *
|
* copied verbatim in the file "LICENSE" *
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
#ifndef FAIRMQMESSAGEZMQ_H_
|
#ifndef FAIR_MQ_ZMQ_MESSAGE_H
|
||||||
#define FAIRMQMESSAGEZMQ_H_
|
#define FAIR_MQ_ZMQ_MESSAGE_H
|
||||||
|
|
||||||
#include <fairmq/Tools.h>
|
#include <fairmq/Tools.h>
|
||||||
#include "FairMQUnmanagedRegionZMQ.h"
|
#include <fairmq/zeromq/UnmanagedRegion.h>
|
||||||
#include <FairMQLogger.h>
|
#include <FairMQLogger.h>
|
||||||
#include <FairMQMessage.h>
|
#include <FairMQMessage.h>
|
||||||
#include <FairMQUnmanagedRegion.h>
|
#include <FairMQUnmanagedRegion.h>
|
||||||
|
@ -22,20 +22,25 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
class FairMQTransportFactory;
|
namespace fair
|
||||||
|
|
||||||
class FairMQSocketZMQ;
|
|
||||||
|
|
||||||
class FairMQMessageZMQ final : public FairMQMessage
|
|
||||||
{
|
{
|
||||||
friend class FairMQSocketZMQ;
|
namespace mq
|
||||||
|
{
|
||||||
|
namespace zmq
|
||||||
|
{
|
||||||
|
|
||||||
|
class Socket;
|
||||||
|
|
||||||
|
class Message final : public fair::mq::Message
|
||||||
|
{
|
||||||
|
friend class Socket;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FairMQMessageZMQ(FairMQTransportFactory* factory = nullptr)
|
Message(FairMQTransportFactory* factory = nullptr)
|
||||||
: FairMQMessage(factory)
|
: fair::mq::Message(factory)
|
||||||
, fUsedSizeModified(false)
|
, fUsedSizeModified(false)
|
||||||
, fUsedSize()
|
, fUsedSize()
|
||||||
, fMsg(fair::mq::tools::make_unique<zmq_msg_t>())
|
, fMsg(tools::make_unique<zmq_msg_t>())
|
||||||
, fViewMsg(nullptr)
|
, fViewMsg(nullptr)
|
||||||
{
|
{
|
||||||
if (zmq_msg_init(fMsg.get()) != 0) {
|
if (zmq_msg_init(fMsg.get()) != 0) {
|
||||||
|
@ -43,11 +48,11 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQMessageZMQ(const size_t size, FairMQTransportFactory* factory = nullptr)
|
Message(const size_t size, FairMQTransportFactory* factory = nullptr)
|
||||||
: FairMQMessage(factory)
|
: fair::mq::Message(factory)
|
||||||
, fUsedSizeModified(false)
|
, fUsedSizeModified(false)
|
||||||
, fUsedSize(size)
|
, fUsedSize(size)
|
||||||
, fMsg(fair::mq::tools::make_unique<zmq_msg_t>())
|
, fMsg(tools::make_unique<zmq_msg_t>())
|
||||||
, fViewMsg(nullptr)
|
, fViewMsg(nullptr)
|
||||||
{
|
{
|
||||||
if (zmq_msg_init_size(fMsg.get(), size) != 0) {
|
if (zmq_msg_init_size(fMsg.get(), size) != 0) {
|
||||||
|
@ -55,11 +60,11 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQMessageZMQ(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr, FairMQTransportFactory* factory = nullptr)
|
Message(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr, FairMQTransportFactory* factory = nullptr)
|
||||||
: FairMQMessage(factory)
|
: fair::mq::Message(factory)
|
||||||
, fUsedSizeModified(false)
|
, fUsedSizeModified(false)
|
||||||
, fUsedSize()
|
, fUsedSize()
|
||||||
, fMsg(fair::mq::tools::make_unique<zmq_msg_t>())
|
, fMsg(tools::make_unique<zmq_msg_t>())
|
||||||
, fViewMsg(nullptr)
|
, fViewMsg(nullptr)
|
||||||
{
|
{
|
||||||
if (zmq_msg_init_data(fMsg.get(), data, size, ffn, hint) != 0) {
|
if (zmq_msg_init_data(fMsg.get(), data, size, ffn, hint) != 0) {
|
||||||
|
@ -67,11 +72,11 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQMessageZMQ(FairMQUnmanagedRegionPtr& region, void* data, const size_t size, void* hint = 0, FairMQTransportFactory* factory = nullptr)
|
Message(UnmanagedRegionPtr& region, void* data, const size_t size, void* hint = 0, FairMQTransportFactory* factory = nullptr)
|
||||||
: FairMQMessage(factory)
|
: fair::mq::Message(factory)
|
||||||
, fUsedSizeModified(false)
|
, fUsedSizeModified(false)
|
||||||
, fUsedSize()
|
, fUsedSize()
|
||||||
, fMsg(fair::mq::tools::make_unique<zmq_msg_t>())
|
, fMsg(tools::make_unique<zmq_msg_t>())
|
||||||
, fViewMsg(nullptr)
|
, fViewMsg(nullptr)
|
||||||
{
|
{
|
||||||
// FIXME: make this zero-copy:
|
// FIXME: make this zero-copy:
|
||||||
|
@ -83,7 +88,7 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
|
|
||||||
std::memcpy(zmq_msg_data(fMsg.get()), data, size);
|
std::memcpy(zmq_msg_data(fMsg.get()), data, size);
|
||||||
// call region callback
|
// call region callback
|
||||||
auto ptr = static_cast<FairMQUnmanagedRegionZMQ*>(region.get());
|
auto ptr = static_cast<UnmanagedRegion*>(region.get());
|
||||||
if (ptr->fBulkCallback) {
|
if (ptr->fBulkCallback) {
|
||||||
ptr->fBulkCallback({{data, size, hint}});
|
ptr->fBulkCallback({{data, size, hint}});
|
||||||
} else if (ptr->fCallback) {
|
} else if (ptr->fCallback) {
|
||||||
|
@ -100,7 +105,7 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
void Rebuild() override
|
void Rebuild() override
|
||||||
{
|
{
|
||||||
CloseMessage();
|
CloseMessage();
|
||||||
fMsg = fair::mq::tools::make_unique<zmq_msg_t>();
|
fMsg = tools::make_unique<zmq_msg_t>();
|
||||||
if (zmq_msg_init(fMsg.get()) != 0) {
|
if (zmq_msg_init(fMsg.get()) != 0) {
|
||||||
LOG(error) << "failed initializing message, reason: " << zmq_strerror(errno);
|
LOG(error) << "failed initializing message, reason: " << zmq_strerror(errno);
|
||||||
}
|
}
|
||||||
|
@ -109,7 +114,7 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
void Rebuild(const size_t size) override
|
void Rebuild(const size_t size) override
|
||||||
{
|
{
|
||||||
CloseMessage();
|
CloseMessage();
|
||||||
fMsg = fair::mq::tools::make_unique<zmq_msg_t>();
|
fMsg = tools::make_unique<zmq_msg_t>();
|
||||||
if (zmq_msg_init_size(fMsg.get(), size) != 0) {
|
if (zmq_msg_init_size(fMsg.get(), size) != 0) {
|
||||||
LOG(error) << "failed initializing message with size, reason: " << zmq_strerror(errno);
|
LOG(error) << "failed initializing message with size, reason: " << zmq_strerror(errno);
|
||||||
}
|
}
|
||||||
|
@ -118,7 +123,7 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
void Rebuild(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr) override
|
void Rebuild(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr) override
|
||||||
{
|
{
|
||||||
CloseMessage();
|
CloseMessage();
|
||||||
fMsg = fair::mq::tools::make_unique<zmq_msg_t>();
|
fMsg = tools::make_unique<zmq_msg_t>();
|
||||||
if (zmq_msg_init_data(fMsg.get(), data, size, ffn, hint) != 0) {
|
if (zmq_msg_init_data(fMsg.get(), data, size, ffn, hint) != 0) {
|
||||||
LOG(error) << "failed initializing message with data, reason: " << zmq_strerror(errno);
|
LOG(error) << "failed initializing message with data, reason: " << zmq_strerror(errno);
|
||||||
}
|
}
|
||||||
|
@ -165,7 +170,7 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
// The check is needed because a send could fail and can be reattempted by the user, in this
|
// The check is needed because a send could fail and can be reattempted by the user, in this
|
||||||
// case we do not want to modify buffer again.
|
// case we do not want to modify buffer again.
|
||||||
if (fUsedSizeModified && !fViewMsg) {
|
if (fUsedSizeModified && !fViewMsg) {
|
||||||
fViewMsg = fair::mq::tools::make_unique<zmq_msg_t>();
|
fViewMsg = tools::make_unique<zmq_msg_t>();
|
||||||
void* ptr = zmq_msg_data(fMsg.get());
|
void* ptr = zmq_msg_data(fMsg.get());
|
||||||
if (zmq_msg_init_data(fViewMsg.get(), ptr, fUsedSize, [](void* /* data */, void* obj) {
|
if (zmq_msg_init_data(fViewMsg.get(), ptr, fUsedSize, [](void* /* data */, void* obj) {
|
||||||
zmq_msg_close(static_cast<zmq_msg_t*>(obj));
|
zmq_msg_close(static_cast<zmq_msg_t*>(obj));
|
||||||
|
@ -176,11 +181,11 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fair::mq::Transport GetType() const override { return fair::mq::Transport::ZMQ; }
|
Transport GetType() const override { return Transport::ZMQ; }
|
||||||
|
|
||||||
void Copy(const FairMQMessage& msg) override
|
void Copy(const fair::mq::Message& msg) override
|
||||||
{
|
{
|
||||||
const FairMQMessageZMQ& zMsg = static_cast<const FairMQMessageZMQ&>(msg);
|
const Message& zMsg = static_cast<const Message&>(msg);
|
||||||
// Shares the message buffer between msg and this fMsg.
|
// Shares the message buffer between msg and this fMsg.
|
||||||
if (zmq_msg_copy(fMsg.get(), zMsg.GetMessage()) != 0) {
|
if (zmq_msg_copy(fMsg.get(), zMsg.GetMessage()) != 0) {
|
||||||
LOG(error) << "failed copying message, reason: " << zmq_strerror(errno);
|
LOG(error) << "failed copying message, reason: " << zmq_strerror(errno);
|
||||||
|
@ -194,7 +199,7 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
~FairMQMessageZMQ() override { CloseMessage(); }
|
~Message() override { CloseMessage(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool fUsedSizeModified;
|
bool fUsedSizeModified;
|
||||||
|
@ -231,4 +236,8 @@ class FairMQMessageZMQ final : public FairMQMessage
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* FAIRMQMESSAGEZMQ_H_ */
|
} // namespace zmq
|
||||||
|
} // namespace mq
|
||||||
|
} // namespace fair
|
||||||
|
|
||||||
|
#endif /* FAIR_MQ_ZMQ_MESSAGE_H */
|
|
@ -6,20 +6,29 @@
|
||||||
* copied verbatim in the file "LICENSE" *
|
* copied verbatim in the file "LICENSE" *
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
#ifndef FAIRMQPOLLERZMQ_H_
|
#ifndef FAIR_MQ_ZMQ_POLLER_H
|
||||||
#define FAIRMQPOLLERZMQ_H_
|
#define FAIR_MQ_ZMQ_POLLER_H
|
||||||
|
|
||||||
#include <FairMQChannel.h>
|
#include <FairMQChannel.h>
|
||||||
#include <FairMQLogger.h>
|
#include <FairMQLogger.h>
|
||||||
#include <FairMQPoller.h>
|
#include <FairMQPoller.h>
|
||||||
#include <unordered_map>
|
|
||||||
#include <vector>
|
|
||||||
#include <zmq.h>
|
#include <zmq.h>
|
||||||
|
|
||||||
class FairMQPollerZMQ final : public FairMQPoller
|
#include <unordered_map>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace fair
|
||||||
|
{
|
||||||
|
namespace mq
|
||||||
|
{
|
||||||
|
namespace zmq
|
||||||
|
{
|
||||||
|
|
||||||
|
class Poller final : public fair::mq::Poller
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FairMQPollerZMQ(const std::vector<FairMQChannel>& channels)
|
Poller(const std::vector<FairMQChannel>& channels)
|
||||||
: fItems()
|
: fItems()
|
||||||
, fNumItems(0)
|
, fNumItems(0)
|
||||||
, fOffsetMap()
|
, fOffsetMap()
|
||||||
|
@ -28,19 +37,19 @@ class FairMQPollerZMQ final : public FairMQPoller
|
||||||
fItems = new zmq_pollitem_t[fNumItems]; // TODO: fix me
|
fItems = new zmq_pollitem_t[fNumItems]; // TODO: fix me
|
||||||
|
|
||||||
for (int i = 0; i < fNumItems; ++i) {
|
for (int i = 0; i < fNumItems; ++i) {
|
||||||
fItems[i].socket = static_cast<const FairMQSocketZMQ*>(&(channels.at(i).GetSocket()))->GetSocket();
|
fItems[i].socket = static_cast<const Socket*>(&(channels.at(i).GetSocket()))->GetSocket();
|
||||||
fItems[i].fd = 0;
|
fItems[i].fd = 0;
|
||||||
fItems[i].revents = 0;
|
fItems[i].revents = 0;
|
||||||
|
|
||||||
int type = 0;
|
int type = 0;
|
||||||
size_t size = sizeof(type);
|
size_t size = sizeof(type);
|
||||||
zmq_getsockopt(static_cast<const FairMQSocketZMQ*>(&(channels.at(i).GetSocket()))->GetSocket(), ZMQ_TYPE, &type, &size);
|
zmq_getsockopt(static_cast<const Socket*>(&(channels.at(i).GetSocket()))->GetSocket(), ZMQ_TYPE, &type, &size);
|
||||||
|
|
||||||
SetItemEvents(fItems[i], type);
|
SetItemEvents(fItems[i], type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQPollerZMQ(const std::vector<FairMQChannel*>& channels)
|
Poller(const std::vector<FairMQChannel*>& channels)
|
||||||
: fItems()
|
: fItems()
|
||||||
, fNumItems(0)
|
, fNumItems(0)
|
||||||
, fOffsetMap()
|
, fOffsetMap()
|
||||||
|
@ -49,19 +58,19 @@ class FairMQPollerZMQ final : public FairMQPoller
|
||||||
fItems = new zmq_pollitem_t[fNumItems];
|
fItems = new zmq_pollitem_t[fNumItems];
|
||||||
|
|
||||||
for (int i = 0; i < fNumItems; ++i) {
|
for (int i = 0; i < fNumItems; ++i) {
|
||||||
fItems[i].socket = static_cast<const FairMQSocketZMQ*>(&(channels.at(i)->GetSocket()))->GetSocket();
|
fItems[i].socket = static_cast<const Socket*>(&(channels.at(i)->GetSocket()))->GetSocket();
|
||||||
fItems[i].fd = 0;
|
fItems[i].fd = 0;
|
||||||
fItems[i].revents = 0;
|
fItems[i].revents = 0;
|
||||||
|
|
||||||
int type = 0;
|
int type = 0;
|
||||||
size_t size = sizeof(type);
|
size_t size = sizeof(type);
|
||||||
zmq_getsockopt(static_cast<const FairMQSocketZMQ*>(&(channels.at(i)->GetSocket()))->GetSocket(), ZMQ_TYPE, &type, &size);
|
zmq_getsockopt(static_cast<const Socket*>(&(channels.at(i)->GetSocket()))->GetSocket(), ZMQ_TYPE, &type, &size);
|
||||||
|
|
||||||
SetItemEvents(fItems[i], type);
|
SetItemEvents(fItems[i], type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQPollerZMQ(const std::unordered_map<std::string, std::vector<FairMQChannel>>& channelsMap, const std::vector<std::string>& channelList)
|
Poller(const std::unordered_map<std::string, std::vector<FairMQChannel>>& channelsMap, const std::vector<std::string>& channelList)
|
||||||
: fItems()
|
: fItems()
|
||||||
, fNumItems(0)
|
, fNumItems(0)
|
||||||
, fOffsetMap()
|
, fOffsetMap()
|
||||||
|
@ -82,13 +91,13 @@ class FairMQPollerZMQ final : public FairMQPoller
|
||||||
for (unsigned int i = 0; i < channelsMap.at(channel).size(); ++i) {
|
for (unsigned int i = 0; i < channelsMap.at(channel).size(); ++i) {
|
||||||
index = fOffsetMap[channel] + i;
|
index = fOffsetMap[channel] + i;
|
||||||
|
|
||||||
fItems[index].socket = static_cast<const FairMQSocketZMQ*>(&(channelsMap.at(channel).at(i).GetSocket()))->GetSocket();
|
fItems[index].socket = static_cast<const Socket*>(&(channelsMap.at(channel).at(i).GetSocket()))->GetSocket();
|
||||||
fItems[index].fd = 0;
|
fItems[index].fd = 0;
|
||||||
fItems[index].revents = 0;
|
fItems[index].revents = 0;
|
||||||
|
|
||||||
int type = 0;
|
int type = 0;
|
||||||
size_t size = sizeof(type);
|
size_t size = sizeof(type);
|
||||||
zmq_getsockopt(static_cast<const FairMQSocketZMQ*>(&(channelsMap.at(channel).at(i).GetSocket()))->GetSocket(), ZMQ_TYPE, &type, &size);
|
zmq_getsockopt(static_cast<const Socket*>(&(channelsMap.at(channel).at(i).GetSocket()))->GetSocket(), ZMQ_TYPE, &type, &size);
|
||||||
|
|
||||||
SetItemEvents(fItems[index], type);
|
SetItemEvents(fItems[index], type);
|
||||||
}
|
}
|
||||||
|
@ -100,8 +109,8 @@ class FairMQPollerZMQ final : public FairMQPoller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQPollerZMQ(const FairMQPollerZMQ&) = delete;
|
Poller(const Poller&) = delete;
|
||||||
FairMQPollerZMQ operator=(const FairMQPollerZMQ&) = delete;
|
Poller operator=(const Poller&) = delete;
|
||||||
|
|
||||||
void SetItemEvents(zmq_pollitem_t& item, const int type)
|
void SetItemEvents(zmq_pollitem_t& item, const int type)
|
||||||
{
|
{
|
||||||
|
@ -177,7 +186,7 @@ class FairMQPollerZMQ final : public FairMQPoller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
~FairMQPollerZMQ() override { delete[] fItems; }
|
~Poller() override { delete[] fItems; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
zmq_pollitem_t* fItems;
|
zmq_pollitem_t* fItems;
|
||||||
|
@ -186,4 +195,8 @@ class FairMQPollerZMQ final : public FairMQPoller
|
||||||
std::unordered_map<std::string, int> fOffsetMap;
|
std::unordered_map<std::string, int> fOffsetMap;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* FAIRMQPOLLERZMQ_H_ */
|
} // namespace zmq
|
||||||
|
} // namespace mq
|
||||||
|
} // namespace fair
|
||||||
|
|
||||||
|
#endif /* FAIR_MQ_ZMQ_POLLER_H */
|
|
@ -6,28 +6,33 @@
|
||||||
* copied verbatim in the file "LICENSE" *
|
* copied verbatim in the file "LICENSE" *
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
#ifndef FAIRMQSOCKETZMQ_H_
|
#ifndef FAIR_MQ_ZMQ_SOCKET_H
|
||||||
#define FAIRMQSOCKETZMQ_H_
|
#define FAIR_MQ_ZMQ_SOCKET_H
|
||||||
|
|
||||||
#include <fairmq/zeromq/Context.h>
|
#include <fairmq/zeromq/Context.h>
|
||||||
|
#include <fairmq/zeromq/Message.h>
|
||||||
#include <fairmq/Tools.h>
|
#include <fairmq/Tools.h>
|
||||||
#include <FairMQLogger.h>
|
#include <FairMQLogger.h>
|
||||||
#include <FairMQSocket.h>
|
#include <FairMQSocket.h>
|
||||||
#include <FairMQMessage.h>
|
#include <FairMQMessage.h>
|
||||||
#include "FairMQMessageZMQ.h"
|
|
||||||
|
|
||||||
#include <zmq.h>
|
#include <zmq.h>
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <memory> // unique_ptr
|
#include <memory> // unique_ptr
|
||||||
|
|
||||||
class FairMQTransportFactory;
|
namespace fair
|
||||||
|
{
|
||||||
|
namespace mq
|
||||||
|
{
|
||||||
|
namespace zmq
|
||||||
|
{
|
||||||
|
|
||||||
class FairMQSocketZMQ final : public FairMQSocket
|
class Socket final : public fair::mq::Socket
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FairMQSocketZMQ(fair::mq::zmq::Context& ctx, const std::string& type, const std::string& name, const std::string& id = "", FairMQTransportFactory* factory = nullptr)
|
Socket(Context& ctx, const std::string& type, const std::string& name, const std::string& id = "", FairMQTransportFactory* factory = nullptr)
|
||||||
: FairMQSocket(factory)
|
: fair::mq::Socket(factory)
|
||||||
, fCtx(ctx)
|
, fCtx(ctx)
|
||||||
, fSocket(zmq_socket(fCtx.GetZmqCtx(), GetConstant(type)))
|
, fSocket(zmq_socket(fCtx.GetZmqCtx(), GetConstant(type)))
|
||||||
, fId(id + "." + name + "." + type)
|
, fId(id + "." + name + "." + type)
|
||||||
|
@ -78,8 +83,8 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
LOG(debug) << "Created socket " << GetId();
|
LOG(debug) << "Created socket " << GetId();
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQSocketZMQ(const FairMQSocketZMQ&) = delete;
|
Socket(const Socket&) = delete;
|
||||||
FairMQSocketZMQ operator=(const FairMQSocketZMQ&) = delete;
|
Socket operator=(const Socket&) = delete;
|
||||||
|
|
||||||
std::string GetId() const override { return fId; }
|
std::string GetId() const override { return fId; }
|
||||||
|
|
||||||
|
@ -99,6 +104,7 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Connect(const std::string& address) override
|
bool Connect(const std::string& address) override
|
||||||
{
|
{
|
||||||
// LOG(info) << "connect socket " << fId << " on " << address;
|
// LOG(info) << "connect socket " << fId << " on " << address;
|
||||||
|
@ -112,7 +118,7 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int Send(FairMQMessagePtr& msg, const int timeout = -1) override
|
int Send(MessagePtr& msg, const int timeout = -1) override
|
||||||
{
|
{
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
if (timeout == 0) {
|
if (timeout == 0) {
|
||||||
|
@ -120,10 +126,10 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
}
|
}
|
||||||
int elapsed = 0;
|
int elapsed = 0;
|
||||||
|
|
||||||
static_cast<FairMQMessageZMQ*>(msg.get())->ApplyUsedSize();
|
static_cast<Message*>(msg.get())->ApplyUsedSize();
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
int nbytes = zmq_msg_send(static_cast<FairMQMessageZMQ*>(msg.get())->GetMessage(), fSocket, flags);
|
int nbytes = zmq_msg_send(static_cast<Message*>(msg.get())->GetMessage(), fSocket, flags);
|
||||||
if (nbytes >= 0) {
|
if (nbytes >= 0) {
|
||||||
fBytesTx += nbytes;
|
fBytesTx += nbytes;
|
||||||
++fMessagesTx;
|
++fMessagesTx;
|
||||||
|
@ -153,7 +159,8 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int Receive(FairMQMessagePtr& msg, const int timeout = -1) override
|
|
||||||
|
int Receive(MessagePtr& msg, const int timeout = -1) override
|
||||||
{
|
{
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
if (timeout == 0) {
|
if (timeout == 0) {
|
||||||
|
@ -162,7 +169,7 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
int elapsed = 0;
|
int elapsed = 0;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
int nbytes = zmq_msg_recv(static_cast<FairMQMessageZMQ*>(msg.get())->GetMessage(), fSocket, flags);
|
int nbytes = zmq_msg_recv(static_cast<Message*>(msg.get())->GetMessage(), fSocket, flags);
|
||||||
if (nbytes >= 0) {
|
if (nbytes >= 0) {
|
||||||
fBytesRx += nbytes;
|
fBytesRx += nbytes;
|
||||||
++fMessagesRx;
|
++fMessagesRx;
|
||||||
|
@ -191,7 +198,8 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int64_t Send(std::vector<std::unique_ptr<FairMQMessage>>& msgVec, const int timeout = -1) override
|
|
||||||
|
int64_t Send(std::vector<std::unique_ptr<fair::mq::Message>>& msgVec, const int timeout = -1) override
|
||||||
{
|
{
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
if (timeout == 0) {
|
if (timeout == 0) {
|
||||||
|
@ -209,9 +217,9 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
bool repeat = false;
|
bool repeat = false;
|
||||||
|
|
||||||
for (unsigned int i = 0; i < vecSize; ++i) {
|
for (unsigned int i = 0; i < vecSize; ++i) {
|
||||||
static_cast<FairMQMessageZMQ*>(msgVec[i].get())->ApplyUsedSize();
|
static_cast<Message*>(msgVec[i].get())->ApplyUsedSize();
|
||||||
|
|
||||||
int nbytes = zmq_msg_send(static_cast<FairMQMessageZMQ*>(msgVec[i].get())->GetMessage(),
|
int nbytes = zmq_msg_send(static_cast<Message*>(msgVec[i].get())->GetMessage(),
|
||||||
fSocket,
|
fSocket,
|
||||||
(i < vecSize - 1) ? ZMQ_SNDMORE|flags : flags);
|
(i < vecSize - 1) ? ZMQ_SNDMORE|flags : flags);
|
||||||
if (nbytes >= 0) {
|
if (nbytes >= 0) {
|
||||||
|
@ -262,7 +270,8 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int64_t Receive(std::vector<std::unique_ptr<FairMQMessage>>& msgVec, const int timeout = -1) override
|
|
||||||
|
int64_t Receive(std::vector<std::unique_ptr<fair::mq::Message>>& msgVec, const int timeout = -1) override
|
||||||
{
|
{
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
if (timeout == 0) {
|
if (timeout == 0) {
|
||||||
|
@ -276,9 +285,9 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
bool repeat = false;
|
bool repeat = false;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
std::unique_ptr<FairMQMessage> part(new FairMQMessageZMQ(GetTransport()));
|
FairMQMessagePtr part = tools::make_unique<Message>(GetTransport());
|
||||||
|
|
||||||
int nbytes = zmq_msg_recv(static_cast<FairMQMessageZMQ*>(part.get())->GetMessage(), fSocket, flags);
|
int nbytes = zmq_msg_recv(static_cast<Message*>(part.get())->GetMessage(), fSocket, flags);
|
||||||
if (nbytes >= 0) {
|
if (nbytes >= 0) {
|
||||||
msgVec.push_back(move(part));
|
msgVec.push_back(move(part));
|
||||||
totalSize += nbytes;
|
totalSize += nbytes;
|
||||||
|
@ -343,6 +352,7 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
LOG(error) << "Failed setting socket option, reason: " << zmq_strerror(errno);
|
LOG(error) << "Failed setting socket option, reason: " << zmq_strerror(errno);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GetOption(const std::string& option, void* value, size_t* valueSize) override
|
void GetOption(const std::string& option, void* value, size_t* valueSize) override
|
||||||
{
|
{
|
||||||
if (zmq_getsockopt(fSocket, GetConstant(option), value, valueSize) < 0)
|
if (zmq_getsockopt(fSocket, GetConstant(option), value, valueSize) < 0)
|
||||||
|
@ -354,75 +364,84 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
void SetLinger(const int value) override
|
void SetLinger(const int value) override
|
||||||
{
|
{
|
||||||
if (zmq_setsockopt(fSocket, ZMQ_LINGER, &value, sizeof(value)) < 0) {
|
if (zmq_setsockopt(fSocket, ZMQ_LINGER, &value, sizeof(value)) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed setting ZMQ_LINGER, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed setting ZMQ_LINGER, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int GetLinger() const override
|
int GetLinger() const override
|
||||||
{
|
{
|
||||||
int value = 0;
|
int value = 0;
|
||||||
size_t valueSize = sizeof(value);
|
size_t valueSize = sizeof(value);
|
||||||
if (zmq_getsockopt(fSocket, ZMQ_LINGER, &value, &valueSize) < 0) {
|
if (zmq_getsockopt(fSocket, ZMQ_LINGER, &value, &valueSize) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed getting ZMQ_LINGER, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed getting ZMQ_LINGER, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetSndBufSize(const int value) override
|
void SetSndBufSize(const int value) override
|
||||||
{
|
{
|
||||||
if (zmq_setsockopt(fSocket, ZMQ_SNDHWM, &value, sizeof(value)) < 0) {
|
if (zmq_setsockopt(fSocket, ZMQ_SNDHWM, &value, sizeof(value)) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed setting ZMQ_SNDHWM, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed setting ZMQ_SNDHWM, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int GetSndBufSize() const override
|
int GetSndBufSize() const override
|
||||||
{
|
{
|
||||||
int value = 0;
|
int value = 0;
|
||||||
size_t valueSize = sizeof(value);
|
size_t valueSize = sizeof(value);
|
||||||
if (zmq_getsockopt(fSocket, ZMQ_SNDHWM, &value, &valueSize) < 0) {
|
if (zmq_getsockopt(fSocket, ZMQ_SNDHWM, &value, &valueSize) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed getting ZMQ_SNDHWM, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed getting ZMQ_SNDHWM, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetRcvBufSize(const int value) override
|
void SetRcvBufSize(const int value) override
|
||||||
{
|
{
|
||||||
if (zmq_setsockopt(fSocket, ZMQ_RCVHWM, &value, sizeof(value)) < 0) {
|
if (zmq_setsockopt(fSocket, ZMQ_RCVHWM, &value, sizeof(value)) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed setting ZMQ_RCVHWM, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed setting ZMQ_RCVHWM, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int GetRcvBufSize() const override
|
int GetRcvBufSize() const override
|
||||||
{
|
{
|
||||||
int value = 0;
|
int value = 0;
|
||||||
size_t valueSize = sizeof(value);
|
size_t valueSize = sizeof(value);
|
||||||
if (zmq_getsockopt(fSocket, ZMQ_RCVHWM, &value, &valueSize) < 0) {
|
if (zmq_getsockopt(fSocket, ZMQ_RCVHWM, &value, &valueSize) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed getting ZMQ_RCVHWM, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed getting ZMQ_RCVHWM, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetSndKernelSize(const int value) override
|
void SetSndKernelSize(const int value) override
|
||||||
{
|
{
|
||||||
if (zmq_setsockopt(fSocket, ZMQ_SNDBUF, &value, sizeof(value)) < 0) {
|
if (zmq_setsockopt(fSocket, ZMQ_SNDBUF, &value, sizeof(value)) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed getting ZMQ_SNDBUF, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed getting ZMQ_SNDBUF, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int GetSndKernelSize() const override
|
int GetSndKernelSize() const override
|
||||||
{
|
{
|
||||||
int value = 0;
|
int value = 0;
|
||||||
size_t valueSize = sizeof(value);
|
size_t valueSize = sizeof(value);
|
||||||
if (zmq_getsockopt(fSocket, ZMQ_SNDBUF, &value, &valueSize) < 0) {
|
if (zmq_getsockopt(fSocket, ZMQ_SNDBUF, &value, &valueSize) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed getting ZMQ_SNDBUF, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed getting ZMQ_SNDBUF, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetRcvKernelSize(const int value) override
|
void SetRcvKernelSize(const int value) override
|
||||||
{
|
{
|
||||||
if (zmq_setsockopt(fSocket, ZMQ_RCVBUF, &value, sizeof(value)) < 0) {
|
if (zmq_setsockopt(fSocket, ZMQ_RCVBUF, &value, sizeof(value)) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed getting ZMQ_RCVBUF, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed getting ZMQ_RCVBUF, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int GetRcvKernelSize() const override
|
int GetRcvKernelSize() const override
|
||||||
{
|
{
|
||||||
int value = 0;
|
int value = 0;
|
||||||
size_t valueSize = sizeof(value);
|
size_t valueSize = sizeof(value);
|
||||||
if (zmq_getsockopt(fSocket, ZMQ_RCVBUF, &value, &valueSize) < 0) {
|
if (zmq_getsockopt(fSocket, ZMQ_RCVBUF, &value, &valueSize) < 0) {
|
||||||
throw fair::mq::SocketError(fair::mq::tools::ToString("failed getting ZMQ_RCVBUF, reason: ", zmq_strerror(errno)));
|
throw SocketError(tools::ToString("failed getting ZMQ_RCVBUF, reason: ", zmq_strerror(errno)));
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
@ -459,10 +478,10 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
~FairMQSocketZMQ() override { Close(); }
|
~Socket() override { Close(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
fair::mq::zmq::Context& fCtx;
|
Context& fCtx;
|
||||||
void* fSocket;
|
void* fSocket;
|
||||||
std::string fId;
|
std::string fId;
|
||||||
std::atomic<unsigned long> fBytesTx;
|
std::atomic<unsigned long> fBytesTx;
|
||||||
|
@ -474,4 +493,8 @@ class FairMQSocketZMQ final : public FairMQSocket
|
||||||
int fRcvTimeout;
|
int fRcvTimeout;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* FAIRMQSOCKETZMQ_H_ */
|
} // namespace zmq
|
||||||
|
} // namespace mq
|
||||||
|
} // namespace fair
|
||||||
|
|
||||||
|
#endif /* FAIR_MQ_ZMQ_SOCKET_H */
|
134
fairmq/zeromq/TransportFactory.h
Normal file
134
fairmq/zeromq/TransportFactory.h
Normal file
|
@ -0,0 +1,134 @@
|
||||||
|
/********************************************************************************
|
||||||
|
* Copyright (C) 2014 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" *
|
||||||
|
********************************************************************************/
|
||||||
|
|
||||||
|
#ifndef FAIR_MQ_ZMQ_TRANSPORTFACTORY_H
|
||||||
|
#define FAIR_MQ_ZMQ_TRANSPORTFACTORY_H
|
||||||
|
|
||||||
|
#include <fairmq/zeromq/Context.h>
|
||||||
|
#include <fairmq/zeromq/Message.h>
|
||||||
|
#include <fairmq/zeromq/Socket.h>
|
||||||
|
#include <fairmq/zeromq/Poller.h>
|
||||||
|
#include <fairmq/zeromq/UnmanagedRegion.h>
|
||||||
|
#include <fairmq/Tools.h>
|
||||||
|
#include <FairMQTransportFactory.h>
|
||||||
|
#include <fairmq/ProgOptions.h>
|
||||||
|
|
||||||
|
#include <memory> // unique_ptr
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace fair
|
||||||
|
{
|
||||||
|
namespace mq
|
||||||
|
{
|
||||||
|
namespace zmq
|
||||||
|
{
|
||||||
|
|
||||||
|
class TransportFactory final : public FairMQTransportFactory
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
TransportFactory(const std::string& id = "", const ProgOptions* config = nullptr)
|
||||||
|
: FairMQTransportFactory(id)
|
||||||
|
, fCtx(nullptr)
|
||||||
|
{
|
||||||
|
int major, minor, patch;
|
||||||
|
zmq_version(&major, &minor, &patch);
|
||||||
|
LOG(debug) << "Transport: Using ZeroMQ library, version: " << major << "." << minor << "." << patch;
|
||||||
|
|
||||||
|
if (config) {
|
||||||
|
fCtx = tools::make_unique<Context>(config->GetProperty<int>("io-threads", 1));
|
||||||
|
} else {
|
||||||
|
LOG(debug) << "fair::mq::ProgOptions not available! Using defaults.";
|
||||||
|
fCtx = tools::make_unique<Context>(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TransportFactory(const TransportFactory&) = delete;
|
||||||
|
TransportFactory operator=(const TransportFactory&) = delete;
|
||||||
|
|
||||||
|
MessagePtr CreateMessage() override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Message>(this);
|
||||||
|
}
|
||||||
|
MessagePtr CreateMessage(const size_t size) override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Message>(size, this);
|
||||||
|
}
|
||||||
|
MessagePtr CreateMessage(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr) override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Message>(data, size, ffn, hint, this);
|
||||||
|
}
|
||||||
|
MessagePtr CreateMessage(UnmanagedRegionPtr& region, void* data, const size_t size, void* hint = 0) override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Message>(region, data, size, hint, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
SocketPtr CreateSocket(const std::string& type, const std::string& name) override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Socket>(*fCtx, type, name, GetId(), this);
|
||||||
|
}
|
||||||
|
|
||||||
|
PollerPtr CreatePoller(const std::vector<FairMQChannel>& channels) const override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Poller>(channels);
|
||||||
|
}
|
||||||
|
PollerPtr CreatePoller(const std::vector<FairMQChannel*>& channels) const override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Poller>(channels);
|
||||||
|
}
|
||||||
|
PollerPtr CreatePoller(const std::unordered_map<std::string, std::vector<FairMQChannel>>& channelsMap, const std::vector<std::string>& channelList) const override
|
||||||
|
{
|
||||||
|
return tools::make_unique<Poller>(channelsMap, channelList);
|
||||||
|
}
|
||||||
|
|
||||||
|
UnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, RegionCallback callback, const std::string& path = "", int flags = 0) override
|
||||||
|
{
|
||||||
|
return CreateUnmanagedRegion(size, 0, callback, nullptr, path, flags);
|
||||||
|
}
|
||||||
|
UnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, RegionBulkCallback bulkCallback, const std::string& path = "", int flags = 0) override
|
||||||
|
{
|
||||||
|
return CreateUnmanagedRegion(size, 0, nullptr, bulkCallback, path, flags);
|
||||||
|
}
|
||||||
|
UnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, const int64_t userFlags, RegionCallback callback, const std::string& path = "", int flags = 0) override
|
||||||
|
{
|
||||||
|
return CreateUnmanagedRegion(size, userFlags, callback, nullptr, path, flags);
|
||||||
|
}
|
||||||
|
UnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, const int64_t userFlags, RegionBulkCallback bulkCallback, const std::string& path = "", int flags = 0) override
|
||||||
|
{
|
||||||
|
return CreateUnmanagedRegion(size, userFlags, nullptr, bulkCallback, path, flags);
|
||||||
|
}
|
||||||
|
UnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, const int64_t userFlags, RegionCallback callback, RegionBulkCallback bulkCallback, const std::string& path = "", int flags = 0)
|
||||||
|
{
|
||||||
|
UnmanagedRegionPtr ptr = tools::make_unique<UnmanagedRegion>(*fCtx, size, userFlags, callback, bulkCallback, path, flags, this);
|
||||||
|
auto zPtr = static_cast<UnmanagedRegion*>(ptr.get());
|
||||||
|
fCtx->AddRegion(zPtr->GetId(), zPtr->GetData(), zPtr->GetSize(), zPtr->GetUserFlags(), RegionEvent::created);
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SubscribeToRegionEvents(RegionEventCallback callback) override { fCtx->SubscribeToRegionEvents(callback); }
|
||||||
|
bool SubscribedToRegionEvents() override { return fCtx->SubscribedToRegionEvents(); }
|
||||||
|
void UnsubscribeFromRegionEvents() override { fCtx->UnsubscribeFromRegionEvents(); }
|
||||||
|
std::vector<RegionInfo> GetRegionInfo() override { return fCtx->GetRegionInfo(); }
|
||||||
|
|
||||||
|
Transport GetType() const override { return Transport::ZMQ; }
|
||||||
|
|
||||||
|
void Interrupt() override { fCtx->Interrupt(); }
|
||||||
|
void Resume() override { fCtx->Resume(); }
|
||||||
|
void Reset() override { fCtx->Reset(); }
|
||||||
|
|
||||||
|
~TransportFactory() override { LOG(debug) << "Destroying ZeroMQ transport..."; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::unique_ptr<Context> fCtx;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace zmq
|
||||||
|
} // namespace mq
|
||||||
|
} // namespace fair
|
||||||
|
|
||||||
|
#endif /* FAIR_MQ_ZMQ_TRANSPORTFACTORY_H */
|
|
@ -6,8 +6,8 @@
|
||||||
* copied verbatim in the file "LICENSE" *
|
* copied verbatim in the file "LICENSE" *
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
#ifndef FAIRMQUNMANAGEDREGIONZMQ_H_
|
#ifndef FAIR_MQ_ZMQ_UNMANAGEDREGION_H
|
||||||
#define FAIRMQUNMANAGEDREGIONZMQ_H_
|
#define FAIR_MQ_ZMQ_UNMANAGEDREGION_H
|
||||||
|
|
||||||
#include <fairmq/zeromq/Context.h>
|
#include <fairmq/zeromq/Context.h>
|
||||||
#include <FairMQUnmanagedRegion.h>
|
#include <FairMQUnmanagedRegion.h>
|
||||||
|
@ -16,23 +16,28 @@
|
||||||
#include <cstddef> // size_t
|
#include <cstddef> // size_t
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
class FairMQTransportFactory;
|
namespace fair
|
||||||
|
|
||||||
class FairMQUnmanagedRegionZMQ final : public FairMQUnmanagedRegion
|
|
||||||
{
|
{
|
||||||
friend class FairMQSocketZMQ;
|
namespace mq
|
||||||
friend class FairMQMessageZMQ;
|
{
|
||||||
|
namespace zmq
|
||||||
|
{
|
||||||
|
|
||||||
|
class UnmanagedRegion final : public fair::mq::UnmanagedRegion
|
||||||
|
{
|
||||||
|
friend class Socket;
|
||||||
|
friend class Message;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FairMQUnmanagedRegionZMQ(fair::mq::zmq::Context& ctx,
|
UnmanagedRegion(Context& ctx,
|
||||||
size_t size,
|
size_t size,
|
||||||
int64_t userFlags,
|
int64_t userFlags,
|
||||||
FairMQRegionCallback callback,
|
RegionCallback callback,
|
||||||
FairMQRegionBulkCallback bulkCallback,
|
RegionBulkCallback bulkCallback,
|
||||||
const std::string& /* path = "" */,
|
const std::string& /* path = "" */,
|
||||||
int /* flags = 0 */,
|
int /* flags = 0 */,
|
||||||
FairMQTransportFactory* factory = nullptr)
|
FairMQTransportFactory* factory = nullptr)
|
||||||
: FairMQUnmanagedRegion(factory)
|
: fair::mq::UnmanagedRegion(factory)
|
||||||
, fCtx(ctx)
|
, fCtx(ctx)
|
||||||
, fId(fCtx.RegionCount())
|
, fId(fCtx.RegionCount())
|
||||||
, fBuffer(malloc(size))
|
, fBuffer(malloc(size))
|
||||||
|
@ -42,15 +47,15 @@ class FairMQUnmanagedRegionZMQ final : public FairMQUnmanagedRegion
|
||||||
, fBulkCallback(bulkCallback)
|
, fBulkCallback(bulkCallback)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
FairMQUnmanagedRegionZMQ(const FairMQUnmanagedRegionZMQ&) = delete;
|
UnmanagedRegion(const UnmanagedRegion&) = delete;
|
||||||
FairMQUnmanagedRegionZMQ operator=(const FairMQUnmanagedRegionZMQ&) = delete;
|
UnmanagedRegion operator=(const UnmanagedRegion&) = delete;
|
||||||
|
|
||||||
virtual void* GetData() const override { return fBuffer; }
|
virtual void* GetData() const override { return fBuffer; }
|
||||||
virtual size_t GetSize() const override { return fSize; }
|
virtual size_t GetSize() const override { return fSize; }
|
||||||
uint64_t GetId() const override { return fId; }
|
uint64_t GetId() const override { return fId; }
|
||||||
int64_t GetUserFlags() const { return fUserFlags; }
|
int64_t GetUserFlags() const { return fUserFlags; }
|
||||||
|
|
||||||
virtual ~FairMQUnmanagedRegionZMQ()
|
virtual ~UnmanagedRegion()
|
||||||
{
|
{
|
||||||
LOG(debug) << "destroying region " << fId;
|
LOG(debug) << "destroying region " << fId;
|
||||||
fCtx.RemoveRegion(fId);
|
fCtx.RemoveRegion(fId);
|
||||||
|
@ -58,13 +63,17 @@ class FairMQUnmanagedRegionZMQ final : public FairMQUnmanagedRegion
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
fair::mq::zmq::Context& fCtx;
|
Context& fCtx;
|
||||||
uint64_t fId;
|
uint64_t fId;
|
||||||
void* fBuffer;
|
void* fBuffer;
|
||||||
size_t fSize;
|
size_t fSize;
|
||||||
int64_t fUserFlags;
|
int64_t fUserFlags;
|
||||||
FairMQRegionCallback fCallback;
|
RegionCallback fCallback;
|
||||||
FairMQRegionBulkCallback fBulkCallback;
|
RegionBulkCallback fBulkCallback;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* FAIRMQUNMANAGEDREGIONZMQ_H_ */
|
} // namespace zmq
|
||||||
|
} // namespace mq
|
||||||
|
} // namespace fair
|
||||||
|
|
||||||
|
#endif /* FAIR_MQ_ZMQ_UNMANAGEDREGION_H */
|
Loading…
Reference in New Issue
Block a user