From bb1ce794b68b23ad76496403b84da481b7efd45a Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Tue, 17 Nov 2020 11:14:38 +0100 Subject: [PATCH] Let single message methods also return int64_t --- fairmq/FairMQChannel.h | 4 ++-- fairmq/FairMQDevice.h | 4 ++-- fairmq/FairMQSocket.h | 4 ++-- fairmq/ofi/Socket.cxx | 4 ++-- fairmq/ofi/Socket.h | 4 ++-- fairmq/shmem/Socket.h | 4 ++-- fairmq/zeromq/Socket.h | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h index f85fbe81..7a2a6f30 100644 --- a/fairmq/FairMQChannel.h +++ b/fairmq/FairMQChannel.h @@ -257,7 +257,7 @@ class FairMQChannel /// @param msg Constant reference of unique_ptr to a FairMQMessage /// @param sndTimeoutInMs send timeout in ms. -1 will wait forever (or until interrupt (e.g. via state change)), 0 will not wait (return immediately if cannot send) /// @return Number of bytes that have been queued, TransferResult::timeout if timed out, TransferResult::error if there was an error, TransferResult::interrupted if interrupted (e.g. by requested state change) - int Send(FairMQMessagePtr& msg, int sndTimeoutInMs = -1) + int64_t Send(FairMQMessagePtr& msg, int sndTimeoutInMs = -1) { CheckSendCompatibility(msg); return fSocket->Send(msg, sndTimeoutInMs); @@ -267,7 +267,7 @@ class FairMQChannel /// @param msg Constant reference of unique_ptr to a FairMQMessage /// @param rcvTimeoutInMs receive timeout in ms. -1 will wait forever (or until interrupt (e.g. via state change)), 0 will not wait (return immediately if cannot receive) /// @return Number of bytes that have been received, TransferResult::timeout if timed out, TransferResult::error if there was an error, TransferResult::interrupted if interrupted (e.g. by requested state change) - int Receive(FairMQMessagePtr& msg, int rcvTimeoutInMs = -1) + int64_t Receive(FairMQMessagePtr& msg, int rcvTimeoutInMs = -1) { CheckReceiveCompatibility(msg); return fSocket->Receive(msg, rcvTimeoutInMs); diff --git a/fairmq/FairMQDevice.h b/fairmq/FairMQDevice.h index 7dc064f0..90b3dc47 100644 --- a/fairmq/FairMQDevice.h +++ b/fairmq/FairMQDevice.h @@ -129,7 +129,7 @@ class FairMQDevice /// @param i channel index /// @param sndTimeoutInMs send timeout in ms, -1 will wait forever (or until interrupt (e.g. via state change)), 0 will not wait (return immediately if cannot send) /// @return Number of bytes that have been queued, TransferResult::timeout if timed out, TransferResult::error if there was an error, TransferResult::interrupted if interrupted (e.g. by requested state change) - int Send(FairMQMessagePtr& msg, const std::string& channel, const int index = 0, int sndTimeoutInMs = -1) + int64_t Send(FairMQMessagePtr& msg, const std::string& channel, const int index = 0, int sndTimeoutInMs = -1) { return GetChannel(channel, index).Send(msg, sndTimeoutInMs); } @@ -140,7 +140,7 @@ class FairMQDevice /// @param i channel index /// @param rcvTimeoutInMs receive timeout in ms, -1 will wait forever (or until interrupt (e.g. via state change)), 0 will not wait (return immediately if cannot receive) /// @return Number of bytes that have been received, TransferResult::timeout if timed out, TransferResult::error if there was an error, TransferResult::interrupted if interrupted (e.g. by requested state change) - int Receive(FairMQMessagePtr& msg, const std::string& channel, const int index = 0, int rcvTimeoutInMs = -1) + int64_t Receive(FairMQMessagePtr& msg, const std::string& channel, const int index = 0, int rcvTimeoutInMs = -1) { return GetChannel(channel, index).Receive(msg, rcvTimeoutInMs); } diff --git a/fairmq/FairMQSocket.h b/fairmq/FairMQSocket.h index a8eaa6d3..a134a659 100644 --- a/fairmq/FairMQSocket.h +++ b/fairmq/FairMQSocket.h @@ -45,8 +45,8 @@ class FairMQSocket virtual bool Bind(const std::string& address) = 0; virtual bool Connect(const std::string& address) = 0; - virtual int Send(FairMQMessagePtr& msg, int timeout = -1) = 0; - virtual int Receive(FairMQMessagePtr& msg, int timeout = -1) = 0; + virtual int64_t Send(FairMQMessagePtr& msg, int timeout = -1) = 0; + virtual int64_t Receive(FairMQMessagePtr& msg, int timeout = -1) = 0; virtual int64_t Send(std::vector>& msgVec, int timeout = -1) = 0; virtual int64_t Receive(std::vector>& msgVec, int timeout = -1) = 0; diff --git a/fairmq/ofi/Socket.cxx b/fairmq/ofi/Socket.cxx index 9c44ddaf..7c661913 100644 --- a/fairmq/ofi/Socket.cxx +++ b/fairmq/ofi/Socket.cxx @@ -254,7 +254,7 @@ auto Socket::ConnectEndpoint(std::unique_ptr& endpoi } } -auto Socket::Send(MessagePtr& msg, const int /*timeout*/) -> int +auto Socket::Send(MessagePtr& msg, const int /*timeout*/) -> int64_t { // timeout argument not yet implemented @@ -412,7 +412,7 @@ auto Socket::SendQueueReaderStatic() -> void }); } -auto Socket::Receive(MessagePtr& msg, const int /*timeout*/) -> int +auto Socket::Receive(MessagePtr& msg, const int /*timeout*/) -> int64_t try { // timeout argument not yet implemented diff --git a/fairmq/ofi/Socket.h b/fairmq/ofi/Socket.h index 39c57de1..8f52e2c8 100644 --- a/fairmq/ofi/Socket.h +++ b/fairmq/ofi/Socket.h @@ -49,8 +49,8 @@ class Socket final : public fair::mq::Socket auto Bind(const std::string& address) -> bool override; auto Connect(const std::string& address) -> bool override; - auto Send(MessagePtr& msg, int timeout = 0) -> int override; - auto Receive(MessagePtr& msg, int timeout = 0) -> int override; + auto Send(MessagePtr& msg, int timeout = 0) -> int64_t override; + auto Receive(MessagePtr& msg, int timeout = 0) -> int64_t override; auto Send(std::vector& msgVec, int timeout = 0) -> int64_t override; auto Receive(std::vector& msgVec, int timeout = 0) -> int64_t override; diff --git a/fairmq/shmem/Socket.h b/fairmq/shmem/Socket.h index dcf68b8a..0bf93b31 100644 --- a/fairmq/shmem/Socket.h +++ b/fairmq/shmem/Socket.h @@ -155,7 +155,7 @@ class Socket final : public fair::mq::Socket } } - int Send(MessagePtr& msg, const int timeout = -1) override + int64_t Send(MessagePtr& msg, const int timeout = -1) override { int flags = 0; if (timeout == 0) { @@ -191,7 +191,7 @@ class Socket final : public fair::mq::Socket return static_cast(TransferResult::error); } - int Receive(MessagePtr& msg, const int timeout = -1) override + int64_t Receive(MessagePtr& msg, const int timeout = -1) override { int flags = 0; if (timeout == 0) { diff --git a/fairmq/zeromq/Socket.h b/fairmq/zeromq/Socket.h index 0e0cea8c..4f55d2ca 100644 --- a/fairmq/zeromq/Socket.h +++ b/fairmq/zeromq/Socket.h @@ -132,7 +132,7 @@ class Socket final : public fair::mq::Socket } } - int Send(MessagePtr& msg, const int timeout = -1) override + int64_t Send(MessagePtr& msg, const int timeout = -1) override { int flags = 0; if (timeout == 0) { @@ -162,7 +162,7 @@ class Socket final : public fair::mq::Socket } } - int Receive(MessagePtr& msg, const int timeout = -1) override + int64_t Receive(MessagePtr& msg, const int timeout = -1) override { int flags = 0; if (timeout == 0) {