Changed: #1440 Clear update flags

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 12 years ago
parent 289cfecf73
commit 6f55028ffa

@ -402,7 +402,7 @@ public:
// TODO // TODO
} }
/// When the user aborts slave-side, when slave-side exits, etc /// When the user aborts slave-side, when slave-side exits, etc (assume the master requested abort or the slave crashed)
virtual void slaveAbortedBuildTask(NLNET::IModuleProxy *sender) virtual void slaveAbortedBuildTask(NLNET::IModuleProxy *sender)
{ {
// TODO // TODO
@ -414,8 +414,8 @@ public:
m_BuildTaskQueue.abortedTask(slave->ActiveTaskId); m_BuildTaskQueue.abortedTask(slave->ActiveTaskId);
slave->ActiveTaskId = 0; slave->ActiveTaskId = 0;
// --slave->SaneBehaviour; // legal behaviour // --slave->SaneBehaviour; // legal behaviour
// slave->TimeOutStamp = NLMISC::CTime::getSecondsSince1970() + 30; // timeout for 30 seconds on this slave // slave->TimeOutStamp = NLMISC::CTime::getSecondsSince1970() + 30; // timeout for 30 seconds on this slave // no timeout
CInfoFlags::getInstance()->addFlag(PIPELINE_INFO_SLAVE_ABORTED); // CInfoFlags::getInstance()->addFlag(PIPELINE_INFO_SLAVE_ABORTED); // don't keep a count
// TODO // TODO
} }

@ -204,9 +204,14 @@ public:
break; break;
case STATUS_UPDATE: case STATUS_UPDATE:
{ {
if (NLMISC::CSynchronized<bool>::CAccessor(&m_StatusUpdateMasterDone).value() NLMISC::CSynchronized<bool>::CAccessor statusUpdateMasterDone(&m_StatusUpdateMasterDone);
&& NLMISC::CSynchronized<bool>::CAccessor(&m_StatusUpdateSlaveDone).value()) if (statusUpdateMasterDone.value())
{ {
NLMISC::CSynchronized<bool>::CAccessor statusUpdateSlaveDone(&m_StatusUpdateSlaveDone);
if (statusUpdateSlaveDone.value())
{
statusUpdateMasterDone.value() = false;
statusUpdateSlaveDone.value() = false;
if (m_AbortRequested) if (m_AbortRequested)
{ {
nlinfo("Aborted slave task after status update"); nlinfo("Aborted slave task after status update");
@ -221,6 +226,7 @@ public:
} }
} }
} }
}
break; break;
} }

Loading…
Cancel
Save