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

Fix Coverity issues

Browse Source
This commit is contained in:
Alexey Rybalchenko
2015-06-26 10:52:05 +02:00
committed by Florian Uhlig
parent 2656d8098c
commit 4db91a52eb
2 changed files with 197 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fairmq/FairMQStateMachine.cxx
View File

@@ -98,7 +98,11 @@ bool FairMQStateMachine::ChangeState(int event)
return false;
}
}
catch (boost::exception &e)
catch (boost::thread_interrupted& e)
{
LOG(ERROR) << boost::diagnostic_information(e);
}
catch (boost::exception& e)
{
LOG(ERROR) << boost::diagnostic_information(e);
}
@@ -121,10 +125,17 @@ void FairMQStateMachine::WaitForEndOfState(int event)
case RESET_TASK:
case RESET_DEVICE:
{
boost::unique_lock<boost::mutex> lock(fStateMutex);
while (!fStateFinished)
try
{
fStateCondition.wait(lock);
boost::unique_lock<boost::mutex> lock(fStateMutex);
while (!fStateFinished)
{
fStateCondition.wait(lock);
}
}
catch (boost::exception& e)
{
LOG(ERROR) << boost::diagnostic_information(e);
}
break;
}
@@ -133,7 +144,7 @@ void FairMQStateMachine::WaitForEndOfState(int event)
break;
}
}
catch (boost::exception &e)
catch (boost::thread_interrupted& e)
{
LOG(ERROR) << boost::diagnostic_information(e);
}
@@ -173,7 +184,7 @@ bool FairMQStateMachine::WaitForEndOfStateForMs(int event, int durationInMs)
return false;
}
}
catch (boost::exception &e)
catch (boost::thread_interrupted &e)
{
LOG(ERROR) << boost::diagnostic_information(e);
}