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

Simplify the handling of send/receive timeouts

Browse Source
This commit is contained in:
Alexey Rybalchenko 2015-11-19 15:30:37 +01:00 committed by Florian Uhlig
parent 0894900f52
commit afda64a83d
3 changed files with 53 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
fairmq/FairMQChannel.cxx
View File

@ -583,60 +583,62 @@ int FairMQChannel::Receive(FairMQMessage* msg, const int flags) const
}
}
bool FairMQChannel::SetSendTimeout(const int timeout)
void FairMQChannel::SetSendTimeout(const int timeout)
{
if (fSocket)
{
if (fSocket->SetSendTimeout(timeout, fAddress, fMethod))
{
// if (fSocket)
// {
// if (fSocket->SetSendTimeout(timeout, fAddress, fMethod))
// {
fSndTimeoutInMs = timeout;
return true;
}
}
// return true;
// }
// }
LOG(ERROR) << "SetSendTimeout() failed - socket is not initialized!";
return false;
// LOG(ERROR) << "SetSendTimeout() failed - socket is not initialized!";
// return false;
}
int FairMQChannel::GetSendTimeout() const
{
if (fSocket)
{
return fSocket->GetSendTimeout();
}
else
{
LOG(ERROR) << "GetSendTimeout() failed - socket is not initialized!";
return -1;
}
return fSndTimeoutInMs;
// if (fSocket)
// {
// return fSocket->GetSendTimeout();
// }
// else
// {
// LOG(ERROR) << "GetSendTimeout() failed - socket is not initialized!";
// return -1;
// }
}
bool FairMQChannel::SetReceiveTimeout(const int timeout)
void FairMQChannel::SetReceiveTimeout(const int timeout)
{
if (fSocket)
{
if (fSocket->SetReceiveTimeout(timeout, fAddress, fMethod))
{
// if (fSocket)
// {
// if (fSocket->SetReceiveTimeout(timeout, fAddress, fMethod))
// {
fRcvTimeoutInMs = timeout;
return true;
}
}
// return true;
// }
// }
LOG(ERROR) << "SetReceiveTimeout() failed - socket is not initialized!";
return false;
// LOG(ERROR) << "SetReceiveTimeout() failed - socket is not initialized!";
// return false;
}
int FairMQChannel::GetReceiveTimeout() const
{
if (fSocket)
{
return fSocket->GetReceiveTimeout();
}
else
{
LOG(ERROR) << "GetReceiveTimeout() failed - socket is not initialized!";
return -1;
}
return fRcvTimeoutInMs;
// if (fSocket)
// {
// return fSocket->GetReceiveTimeout();
// }
// else
// {
// LOG(ERROR) << "GetReceiveTimeout() failed - socket is not initialized!";
// return -1;
// }
}
bool FairMQChannel::ExpectsAnotherPart() const

6
fairmq/FairMQChannel.h
View File

@ -161,8 +161,7 @@ class FairMQChannel
/// Sets a timeout on the (blocking) Send method
/// @param timeout timeout value in milliseconds
/// @return true if operation was successfull, otherwise false.
bool SetSendTimeout(const int timeout);
void SetSendTimeout(const int timeout);
/// Gets the current value of the timeout on the (blocking) Send method
/// @return Timeout value in milliseconds. -1 for no timeout.
@ -170,8 +169,7 @@ class FairMQChannel
/// Sets a timeout on the (blocking) Receive method
/// @param timeout timeout value in milliseconds
/// @return true if operation was successfull, otherwise false.
bool SetReceiveTimeout(const int timeout);
void SetReceiveTimeout(const int timeout);
/// Gets the current value of the timeout on the (blocking) Receive method
/// @return Timeout value in milliseconds. -1 for no timeout.

24
fairmq/test/runTransferTimeoutTest.cxx
View File

@ -37,28 +37,9 @@ class TransferTimeoutTester : public FairMQDevice
bool sendCanceling = false;
bool receiveCanceling = false;
if (fChannels.at("data-out").at(0).SetSendTimeout(1000))
{
setSndOK = true;
LOG(INFO) << "set send timeout OK";
}
else
{
LOG(ERROR) << "set send timeout failed";
}
fChannels.at("data-out").at(0).SetSendTimeout(1000);
fChannels.at("data-in").at(0).SetReceiveTimeout(1000);
if (fChannels.at("data-in").at(0).SetReceiveTimeout(1000))
{
setRcvOK = true;
LOG(INFO) << "set receive timeout OK";
}
else
{
LOG(ERROR) << "set receive timeout failed";
}
if (setSndOK && setRcvOK)
{
if (fChannels.at("data-out").at(0).GetSendTimeout() == 1000)
{
getSndOK = true;
@ -78,7 +59,6 @@ class TransferTimeoutTester : public FairMQDevice
{
LOG(ERROR) << "get receive timeout failed";
}
}
if (getSndOK && getRcvOK)
{