merge the trunk with the development of ZeroMQ branch

git-svn-id: https://subversion.gsi.de/fairroot/fairbase/trunk@22451 0381ead4-6506-0410-b988-94b70fbc4730
This commit is contained in:
Mohammad Al-Turany
2013-10-25 12:42:48 +00:00
parent d65d7e490f
commit 5121fe3ae5
36 changed files with 1291 additions and 727 deletions

View File

@@ -109,7 +109,7 @@ Bool_t FairMQSocket::Send(FairMQMessage* msg)
try {
fBytesTx += msg->Size();
++fMessagesTx;
result = fSocket->send(*msg->GetMessage());
result = fSocket->send(*msg->GetMessage()); // use send(*msg->GetMessage(), ZMQ_DONTWAIT) for non-blocking call
} catch (zmq::error_t& e) {
std::stringstream logmsg;
logmsg << "failed sending on socket #" << fId << ", reason: " << e.what();