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

made compatible with timer library API changes

Browse Source
This commit is contained in:
Jeff Hill
2001-05-22 01:37:09 +00:00
parent 1f7c046c8f
commit f8cf4a582e
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libCom/fdmgr/fdManager.cpp
View File

@@ -154,11 +154,7 @@ epicsShareFunc void fdManager::process (double delay)
// more than once here so that fd activity get serviced
// in a reasonable length of time.
//
minDelay = this->pTimerQueue->getNextExpireDelay ();
if ( minDelay <= 0.0 ) {
this->pTimerQueue->process();
minDelay = this->pTimerQueue->getNextExpireDelay ();
}
minDelay = this->pTimerQueue->process(epicsTime::getCurrent());
if ( minDelay >= delay ) {
minDelay = delay;
@@ -192,7 +188,7 @@ epicsShareFunc void fdManager::process (double delay)
&this->fdSets[fdrWrite], &this->fdSets[fdrException], &tv);
}
this->pTimerQueue->process();
this->pTimerQueue->process(epicsTime::getCurrent());
if (status==0) {
this->processInProg = 0;
return;

8
src/libCom/fdmgr/fdmgr.cpp
View File

@@ -83,7 +83,7 @@ private:
pCallBackFDMgr pFunc;
void *pParam;
unsigned id;
epicsShareFunc expireStatus expire ();
epicsShareFunc expireStatus expire ( const epicsTime & currentTime );
};
class oldFdmgr : public fdManager {
@@ -122,14 +122,14 @@ epicsShareFunc void fdRegForOldFdmgr::callBack ()
timerForOldFdmgr::timerForOldFdmgr ( oldFdmgr &fdmgrIn,
double delayIn, pCallBackFDMgr pFuncIn, void * pParamIn ) :
timer ( fdmgrIn.timerQueueRef().createTimer( *this ) ),
timer ( fdmgrIn.timerQueueRef().createTimer() ),
fdmgr ( fdmgrIn ), pFunc ( pFuncIn ), pParam( pParamIn )
{
if ( pFuncIn == NULL ) {
throwWithLocation ( noFunctionSpecified () );
}
this->fdmgr.resTbl.add (*this);
this->timer.start ( delayIn );
this->timer.start ( *this, delayIn );
}
timerForOldFdmgr::~timerForOldFdmgr ()
@@ -143,7 +143,7 @@ timerForOldFdmgr::~timerForOldFdmgr ()
delete & this->timer;
}
epicsTimerNotify::expireStatus timerForOldFdmgr::expire ()
epicsTimerNotify::expireStatus timerForOldFdmgr::expire ( const epicsTime & )
{
(*this->pFunc) (this->pParam);
return noRestart;