Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 00:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility with nanomsg<=0.6

Browse Source
This commit is contained in:
Alexey Rybalchenko 2017-03-21 09:48:44 +01:00
parent 3c73c690f7
commit 341464a793
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fairmq/nanomsg/FairMQSocketNN.cxx
View File

@ -138,7 +138,11 @@ int FairMQSocketNN::Send(FairMQMessagePtr& msg, const int flags)
return nbytes; return nbytes;
} }
#if NN_VERSION_CURRENT>2 // backwards-compatibility with nanomsg version<=0.6
else if (nn_errno() == ETIMEDOUT) else if (nn_errno() == ETIMEDOUT)
#else
else if (nn_errno() == EAGAIN)
#endif
{ {
if (!fInterrupted && ((flags & NN_DONTWAIT) == 0)) if (!fInterrupted && ((flags & NN_DONTWAIT) == 0))
{ {
@ -182,7 +186,11 @@ int FairMQSocketNN::Receive(FairMQMessagePtr& msg, const int flags)
static_cast<FairMQMessageNN*>(msg.get())->fReceiving = true; static_cast<FairMQMessageNN*>(msg.get())->fReceiving = true;
return nbytes; return nbytes;
} }
#if NN_VERSION_CURRENT>2 // backwards-compatibility with nanomsg version<=0.6
else if (nn_errno() == ETIMEDOUT) else if (nn_errno() == ETIMEDOUT)
#else
else if (nn_errno() == EAGAIN)
#endif
{ {
if (!fInterrupted && ((flags & NN_DONTWAIT) == 0)) if (!fInterrupted && ((flags & NN_DONTWAIT) == 0))
{ {
@ -239,7 +247,11 @@ int64_t FairMQSocketNN::Send(vector<unique_ptr<FairMQMessage>>& msgVec, const in
++fMessagesTx; ++fMessagesTx;
return nbytes; return nbytes;
} }
#if NN_VERSION_CURRENT>2 // backwards-compatibility with nanomsg version<=0.6
else if (nn_errno() == ETIMEDOUT) else if (nn_errno() == ETIMEDOUT)
#else
else if (nn_errno() == EAGAIN)
#endif
{ {
if (!fInterrupted && ((flags & NN_DONTWAIT) == 0)) if (!fInterrupted && ((flags & NN_DONTWAIT) == 0))
{ {
@ -317,7 +329,11 @@ int64_t FairMQSocketNN::Receive(vector<unique_ptr<FairMQMessage>>& msgVec, const
nn_freemsg(ptr); nn_freemsg(ptr);
return nbytes; return nbytes;
} }
#if NN_VERSION_CURRENT>2 // backwards-compatibility with nanomsg version<=0.6
else if (nn_errno() == ETIMEDOUT) else if (nn_errno() == ETIMEDOUT)
#else
else if (nn_errno() == EAGAIN)
#endif
{ {
if (!fInterrupted && ((flags & NN_DONTWAIT) == 0)) if (!fInterrupted && ((flags & NN_DONTWAIT) == 0))
{ {