epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

clean up state transitions

Browse Source
This commit is contained in:
Jeff Hill
2002-06-25 15:11:52 +00:00
parent 02ed07196b
commit c78c3ce853
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libCom/timer/timerQueue.cpp
View File

@@ -118,22 +118,25 @@ double timerQueue::process ( const epicsTime & currentTime )
// while the call back was running
//
if ( this->cancelPending ) {
this->pExpireTmr->curState = timer::stateLimbo;
// 1) if another thread is canceling cancel() waits for this
// 2) if this thread is canceling in the timer callback then
// dont touch timer or notify here because the cancel might
// have occurred because they destroyed the time rin the
// have occurred because they destroyed the timer in the
// callback
this->cancelPending = false;
this->cancelBlockingEvent.signal ();
}
// restart as nec
else {
this->pExpireTmr->curState = timer::stateLimbo;
// restart as nec
if ( expStat.restart() ) {
this->pExpireTmr->privateStart (
*pTmpNotify, currentTime + expStat.expirationDelay() );
}
else {
this->pExpireTmr->curState = timer::stateLimbo;
}
}
this->pExpireTmr = 0;