epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

minor optimization in timer queue process

Browse Source
This commit is contained in:
Jeff Hill
2001-03-26 18:34:59 +00:00
parent a609b3394b
commit 8ef0216cf5
1 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,27 +73,27 @@ void timerQueue::process ()
return;
}
this->pExpireTmr = this->timerList.get ();
if ( ! this->pExpireTmr ) {
return;
}
if ( cur > this->pExpireTmr->exp ) {
//
// Tag current epired tmr so that we can detect if call back
// is in progress when canceling the timer.
//
# ifdef DEBUG
this->pExpireTmr->show ( 0u );
# endif
this->pExpireTmr->curState = timer::stateLimbo;
this->processThread = epicsThreadGetIdSelf ();
this->pExpireTmr = this->timerList.first ();
if ( this->pExpireTmr ) {
if ( cur >= this->pExpireTmr->exp ) {
this->timerList.remove ( *this->pExpireTmr );
//
// Tag current epired tmr so that we can detect if call back
// is in progress when canceling the timer.
//
this->pExpireTmr->curState = timer::stateLimbo;
this->processThread = epicsThreadGetIdSelf ();
# ifdef DEBUG
this->pExpireTmr->show ( 0u );
# endif
}
else {
this->pExpireTmr = 0;
debugPrintf ( ( "no activity process %f to next\n", this->pExpireTmr->exp - cur ) );
return;
}
}
else {
// no activity
debugPrintf ( ( "no activity process\n" ) );
this->timerList.push ( *this->pExpireTmr );
this->pExpireTmr = 0;
return;
}
}
@@ -117,30 +117,31 @@ void timerQueue::process ()
// while the call back was running
//
if ( this->cancelPending ) {
// cancel () waits for this
// cancel() waits for this
this->cancelPending = false;
this->cancelBlockingEvent.signal ();
}
// restart as nec
else if ( expStat.restart () ) {
this->pExpireTmr->privateStart ( cur + expStat.expirationDelay () );
else if ( expStat.restart() ) {
this->pExpireTmr->privateStart ( cur + expStat.expirationDelay() );
}
this->pExpireTmr = this->timerList.get ();
if ( ! this->pExpireTmr ) {
this->processThread = 0;
return;
}
if ( cur > this->pExpireTmr->exp ) {
# ifdef DEBUG
this->pExpireTmr->show ( 0u );
# endif
this->pExpireTmr->curState = timer::stateLimbo;
this->pExpireTmr = this->timerList.first ();
if ( this->pExpireTmr ) {
if ( cur >= this->pExpireTmr->exp ) {
this->timerList.remove ( *this->pExpireTmr );
this->pExpireTmr->curState = timer::stateLimbo;
# ifdef DEBUG
this->pExpireTmr->show ( 0u );
# endif
}
else {
this->pExpireTmr = 0;
this->processThread = 0;
return;
}
}
else {
// no activity
this->timerList.push ( *this->pExpireTmr );
this->pExpireTmr = 0;
this->processThread = 0;
return;
}