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

workaround so that fix for bogus HP warningn isnt causing a warning with sun pro

Browse Source
This commit is contained in:
Jeff Hill
2002-06-14 17:15:10 +00:00
parent 08324fc8ec
commit 5e1ea4868b
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,7 @@ double timerQueue::process ( const epicsTime & currentTime )
unsigned N = 0u;
# endif
double delay = DBL_MAX;
while ( true ) {
epicsTimerNotify *pTmpNotify = this->pExpireTmr->pNotify;
this->pExpireTmr->pNotify = 0;
@@ -112,31 +113,29 @@ double timerQueue::process ( const epicsTime & currentTime )
expStat = pTmpNotify->expire ( currentTime );
}
{
//
// only restart if they didnt cancel() the timer
// while the call back was running
//
if ( this->cancelPending ) {
//
// only restart if they didnt cancel() the timer
// while the call back was running
//
if ( this->cancelPending ) {
// 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
// callback
this->cancelPending = false;
this->cancelBlockingEvent.signal ();
}
// restart as nec
else {
this->pExpireTmr->curState = timer::stateLimbo;
if ( expStat.restart() ) {
this->pExpireTmr->privateStart (
*pTmpNotify, currentTime + expStat.expirationDelay() );
}
}
this->pExpireTmr = 0;
// 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
// callback
this->cancelPending = false;
this->cancelBlockingEvent.signal ();
}
// restart as nec
else {
this->pExpireTmr->curState = timer::stateLimbo;
if ( expStat.restart() ) {
this->pExpireTmr->privateStart (
*pTmpNotify, currentTime + expStat.expirationDelay() );
}
}
this->pExpireTmr = 0;
if ( this->timerList.first () ) {
if ( currentTime >= this->timerList.first ()->exp ) {
@@ -148,17 +147,18 @@ double timerQueue::process ( const epicsTime & currentTime )
# endif
}
else {
double delay = this->timerList.first ()->exp - currentTime;
delay = this->timerList.first ()->exp - currentTime;
this->processThread = 0;
return delay;
break;
}
}
else {
this->processThread = 0;
return DBL_MAX;
delay = DBL_MAX;
break;
}
}
return DBL_MAX; // Never here; compiler happy
return delay;
}
epicsTimer & timerQueue::createTimer ()