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

fixed reference to freed memory

Browse Source
This commit is contained in:
Jeff Hill
2002-08-21 23:57:35 +00:00
parent 0058debd45
commit b566183c2f
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/timer/timer.cpp
+1
View File
@@ -151,6 +151,7 @@ void timer::cancel ()
}
else if ( this->curState == stateActive ) {
this->queue.cancelPending = true;
this->curState = timer::stateLimbo;
if ( this->queue.processThread != epicsThreadGetIdSelf() ) {
// make certain timer expire() does not run after cancel () returns,
// but dont require that lock is applied while calling expire()
src/libCom/timer/timerQueue.cpp
+10 -13
View File
@@ -100,15 +100,11 @@ double timerQueue::process ( const epicsTime & currentTime )
expStat = pTmpNotify->expire ( currentTime );
}
this->pExpireTmr->curState = timer::stateLimbo;
//
// only restart if they didnt cancel() the timer
// while the call back was running
//
if ( this->cancelPending ) {
this->pExpireTmr->pNotify = 0;
// 1) if another thread is canceling then cancel() waits for
// the event below
// 2) if this thread is canceling in the timer callback then
@@ -118,16 +114,17 @@ double timerQueue::process ( const epicsTime & currentTime )
this->cancelPending = false;
this->cancelBlockingEvent.signal ();
}
else if ( this->pExpireTmr->pNotify ) {
// pNotify was cleared above so if it is valid now we know that
// someone has started the timer from another thread and that
// predominates over the restart parameters from expire.
this->pExpireTmr->privateStart (
*this->pExpireTmr->pNotify, this->pExpireTmr->exp );
}
else {
// restart as nec
if ( expStat.restart() ) {
this->pExpireTmr->curState = timer::stateLimbo;
if ( this->pExpireTmr->pNotify ) {
// pNotify was cleared above so if it is valid now we know that
// someone has started the timer from another thread and that
// predominates over the restart parameters from expire.
this->pExpireTmr->privateStart (
*this->pExpireTmr->pNotify, this->pExpireTmr->exp );
}
else if ( expStat.restart() ) {
// restart as nec
this->pExpireTmr->privateStart (
*pTmpNotify, currentTime + expStat.expirationDelay() );
}