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

simplify state change callback handling

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-08-28 13:35:45 +02:00
committed by Mohammad Al-Turany
parent eeb994a584
commit 4dd08051cc
3 changed files with 29 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fairmq/FairMQDevice.cxx
View File

@@ -261,10 +261,7 @@ void FairMQDevice::InitWrapper()
}
}
}
if (!fStateChangeCallback.empty())
{
fStateChangeCallback(INITIALIZING_DEVICE);
}
CallStateChangeCallbacks(INITIALIZING_DEVICE);
// Bind channels. Here one run is enough, because bind settings should be available locally
// If necessary this could be handled in the same way as the connecting channels
@@ -452,10 +449,7 @@ bool FairMQDevice::BindEndpoint(FairMQSocket& socket, string& endpoint)
void FairMQDevice::InitTaskWrapper()
{
if (!fStateChangeCallback.empty())
{
fStateChangeCallback(INITIALIZING_TASK);
}
CallStateChangeCallbacks(INITIALIZING_TASK);
InitTask();
@@ -517,10 +511,7 @@ void FairMQDevice::PrintChannel(const string& name)
void FairMQDevice::RunWrapper()
{
if (!fStateChangeCallback.empty())
{
fStateChangeCallback(RUNNING);
}
CallStateChangeCallbacks(RUNNING);
LOG(INFO) << "DEVICE: Running...";
@@ -793,10 +784,7 @@ void FairMQDevice::PostRun()
void FairMQDevice::PauseWrapper()
{
if (!fStateChangeCallback.empty())
{
fStateChangeCallback(PAUSED);
}
CallStateChangeCallbacks(PAUSED);
Pause();
}
@@ -1237,10 +1225,7 @@ void FairMQDevice::Unblock()
void FairMQDevice::ResetTaskWrapper()
{
if (!fStateChangeCallback.empty())
{
fStateChangeCallback(RESETTING_TASK);
}
CallStateChangeCallbacks(RESETTING_TASK);
ResetTask();
@@ -1253,10 +1238,7 @@ void FairMQDevice::ResetTask()
void FairMQDevice::ResetWrapper()
{
if (!fStateChangeCallback.empty())
{
fStateChangeCallback(RESETTING_DEVICE);
}
CallStateChangeCallbacks(RESETTING_DEVICE);
Reset();