From e6f67b365824d230b5ae1cc7e97ab85e150d307c Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Fri, 7 May 2021 21:58:54 +0200 Subject: [PATCH] Fix Ofi interface --- fairmq/ofi/Socket.h | 2 +- fairmq/ofi/TransportFactory.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fairmq/ofi/Socket.h b/fairmq/ofi/Socket.h index 153e89b6..9d8408a4 100644 --- a/fairmq/ofi/Socket.h +++ b/fairmq/ofi/Socket.h @@ -41,7 +41,7 @@ class Socket final : public fair::mq::Socket auto GetId() const -> std::string override { return fId; } - auto Events(uint32_t *events) -> int override { *events = 0; } + auto Events(uint32_t *events) -> int override { *events = 0; return -1; } auto Bind(const std::string& address) -> bool override; auto Connect(const std::string& address) -> bool override; diff --git a/fairmq/ofi/TransportFactory.h b/fairmq/ofi/TransportFactory.h index d3dda3ce..ba76ff28 100644 --- a/fairmq/ofi/TransportFactory.h +++ b/fairmq/ofi/TransportFactory.h @@ -44,10 +44,10 @@ class TransportFactory final : public FairMQTransportFactory auto CreatePoller(const std::vector& channels) const -> PollerPtr override; auto CreatePoller(const std::unordered_map>& channelsMap, const std::vector& channelList) const -> PollerPtr override; - auto CreateUnmanagedRegion(const size_t size, RegionCallback callback = nullptr, const std::string& path = "", int flags = 0) -> UnmanagedRegionPtr override; - auto CreateUnmanagedRegion(const size_t size, RegionBulkCallback callback = nullptr, const std::string& path = "", int flags = 0) -> UnmanagedRegionPtr override; - auto CreateUnmanagedRegion(const size_t size, int64_t userFlags, RegionCallback callback = nullptr, const std::string& path = "", int flags = 0) -> UnmanagedRegionPtr override; - auto CreateUnmanagedRegion(const size_t size, int64_t userFlags, RegionBulkCallback callback = nullptr, const std::string& path = "", int flags = 0) -> UnmanagedRegionPtr override; + auto CreateUnmanagedRegion(const size_t size, RegionCallback callback = nullptr, const std::string& path = "", int flags = 0, fair::mq::RegionConfig cfg = fair::mq::RegionConfig()) -> UnmanagedRegionPtr override; + auto CreateUnmanagedRegion(const size_t size, RegionBulkCallback callback = nullptr, const std::string& path = "", int flags = 0, fair::mq::RegionConfig cfg = fair::mq::RegionConfig()) -> UnmanagedRegionPtr override; + auto CreateUnmanagedRegion(const size_t size, int64_t userFlags, RegionCallback callback = nullptr, const std::string& path = "", int flags = 0, fair::mq::RegionConfig cfg = fair::mq::RegionConfig()) -> UnmanagedRegionPtr override; + auto CreateUnmanagedRegion(const size_t size, int64_t userFlags, RegionBulkCallback callback = nullptr, const std::string& path = "", int flags = 0, fair::mq::RegionConfig cfg = fair::mq::RegionConfig()) -> UnmanagedRegionPtr override; void SubscribeToRegionEvents(RegionEventCallback /* callback */) override { LOG(error) << "SubscribeToRegionEvents not yet implemented for OFI"; } bool SubscribedToRegionEvents() override { LOG(error) << "Region event subscriptions not yet implemented for OFI"; return false; }