From a3afadb824a5b673316ab37ba7ecd28926f17251 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Fri, 8 May 2020 10:38:32 +0200 Subject: [PATCH] Call region event callback with local_only event for zmq --- fairmq/FairMQUnmanagedRegion.h | 16 +++++++++++----- fairmq/zeromq/FairMQTransportFactoryZMQ.cxx | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/fairmq/FairMQUnmanagedRegion.h b/fairmq/FairMQUnmanagedRegion.h index b91c7836..d3fe316f 100644 --- a/fairmq/FairMQUnmanagedRegion.h +++ b/fairmq/FairMQUnmanagedRegion.h @@ -19,7 +19,8 @@ class FairMQTransportFactory; enum class FairMQRegionEvent : int { created, - destroyed + destroyed, + local_only }; struct FairMQRegionInfo @@ -72,10 +73,15 @@ using FairMQUnmanagedRegionPtr = std::unique_ptr; inline std::ostream& operator<<(std::ostream& os, const FairMQRegionEvent& event) { - if (event == FairMQRegionEvent::created) { - return os << "created"; - } else { - return os << "destroyed"; + switch (event) { + case FairMQRegionEvent::created: + return os << "created"; + case FairMQRegionEvent::destroyed: + return os << "destroyed"; + case FairMQRegionEvent::local_only: + return os << "local_only"; + default: + return os << "unrecognized event"; } } diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx index 1bd434ba..87e40609 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx @@ -50,6 +50,7 @@ FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ(const string& id, const fai LOG(error) << "failed configuring context, reason: " << zmq_strerror(errno); } + fRegionEvents.emplace(0, nullptr, 0, 0, fair::mq::RegionEvent::local_only); } FairMQMessagePtr FairMQTransportFactoryZMQ::CreateMessage()