epics/epics-base
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:51:55 +00:00
parent 63c2a025d3
commit fa87c186fe
14 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cas/example/simple/exAsyncPV.cc
+6 -6
View File
@@ -56,9 +56,9 @@ caStatus exAsyncPV::write ( const casCtx &ctx, const gdd &valueIn )
exAsyncWriteIO::exAsyncWriteIO ( const casCtx &ctxIn, exAsyncPV &pvIn,
const gdd &valueIn ) :
casAsyncWriteIO ( ctxIn ), pv ( pvIn ),
timer ( pvIn.getCAS()->timerQueue().createTimer ( *this ) ), pValue(valueIn)
timer ( pvIn.getCAS()->timerQueue().createTimer () ), pValue(valueIn)
{
this->timer.start ( 0.1 );
this->timer.start ( *this, 0.1 );
}
//
@@ -74,7 +74,7 @@ exAsyncWriteIO::~exAsyncWriteIO()
// exAsyncWriteIO::expire()
// (a virtual function that runs when the base timer expires)
//
epicsTimerNotify::expireStatus exAsyncWriteIO::expire ()
epicsTimerNotify::expireStatus exAsyncWriteIO::expire ( const epicsTime & currentTime )
{
caStatus status;
status = this->pv.update ( this->pValue );
@@ -88,9 +88,9 @@ epicsTimerNotify::expireStatus exAsyncWriteIO::expire ()
exAsyncReadIO::exAsyncReadIO ( const casCtx &ctxIn, exAsyncPV &pvIn,
gdd &protoIn ) :
casAsyncReadIO ( ctxIn ), pv ( pvIn ),
timer ( pvIn.getCAS()->timerQueue().createTimer(*this) ), pProto ( protoIn )
timer ( pvIn.getCAS()->timerQueue().createTimer() ), pProto ( protoIn )
{
this->timer.start ( 0.1 );
this->timer.start ( *this, 0.1 );
}
//
@@ -107,7 +107,7 @@ exAsyncReadIO::~exAsyncReadIO()
// exAsyncReadIO::expire()
// (a virtual function that runs when the base timer expires)
//
epicsTimerNotify::expireStatus exAsyncReadIO::expire ()
epicsTimerNotify::expireStatus exAsyncReadIO::expire ( const epicsTime & currentTime )
{
caStatus status;
src/cas/example/simple/exPV.cc
+4 -4
View File
@@ -22,7 +22,7 @@ class exFixedStringDestructor: public gddDestructor {
// exPV::exPV()
//
exPV::exPV ( pvInfo &setup, bool preCreateFlag, bool scanOnIn ) :
timer ( this->getCAS()->timerQueue().createTimer(*this) ),
timer ( this->getCAS()->timerQueue().createTimer() ),
info ( setup ),
interest ( false ),
preCreate ( preCreateFlag ),
@@ -39,7 +39,7 @@ exPV::exPV ( pvInfo &setup, bool preCreateFlag, bool scanOnIn ) :
// someone is watching the PV)
//
if ( this->scanOn && this->info.getScanPeriod () > 0.0 ) {
this->timer.start ( this->getScanPeriod() );
this->timer.start ( *this, this->getScanPeriod() );
}
}
@@ -97,7 +97,7 @@ caStatus exPV::update(smartConstGDDPointer pValueIn)
//
// exScanTimer::expire ()
//
epicsTimerNotify::expireStatus exPV::expire ()
epicsTimerNotify::expireStatus exPV::expire ( const epicsTime & currentTime )
{
this->scan();
if ( this->scanOn ) {
@@ -130,7 +130,7 @@ caStatus exPV::interestRegister()
this->interest = true;
if ( this->scanOn && this->getScanPeriod() < this->timer.getExpireDelay() ) {
this->timer.start ( this->getScanPeriod() );
this->timer.start ( *this, this->getScanPeriod() );
}
return S_casApp_success;
src/cas/example/simple/exServer.cc
+6 -6
View File
@@ -318,9 +318,9 @@ void exServer::show (unsigned level) const
exAsyncExistIO::exAsyncExistIO ( const pvInfo &pviIn, const casCtx &ctxIn,
exServer &casIn ) :
casAsyncPVExistIO ( ctxIn ), pvi ( pviIn ),
timer ( casIn.timerQueue().createTimer ( *this ) ), cas ( casIn )
timer ( casIn.timerQueue().createTimer () ), cas ( casIn )
{
this->timer.start ( 0.00001 );
this->timer.start ( *this, 0.00001 );
}
//
@@ -336,7 +336,7 @@ exAsyncExistIO::~exAsyncExistIO()
// exAsyncExistIO::expire()
// (a virtual function that runs when the base timer expires)
//
epicsTimerNotify::expireStatus exAsyncExistIO::expire ()
epicsTimerNotify::expireStatus exAsyncExistIO::expire ( const epicsTime & currentTime )
{
//
// post IO completion
@@ -352,10 +352,10 @@ epicsTimerNotify::expireStatus exAsyncExistIO::expire ()
exAsyncCreateIO::exAsyncCreateIO ( pvInfo &pviIn, exServer &casIn,
const casCtx &ctxIn, bool scanOnIn ) :
casAsyncPVAttachIO ( ctxIn ), pvi ( pviIn ),
timer ( casIn.timerQueue().createTimer ( *this ) ),
timer ( casIn.timerQueue().createTimer () ),
cas ( casIn ), scanOn ( scanOnIn )
{
this->timer.start ( 0.00001 );
this->timer.start ( *this, 0.00001 );
}
//
@@ -371,7 +371,7 @@ exAsyncCreateIO::~exAsyncCreateIO()
// exAsyncCreateIO::expire()
// (a virtual function that runs when the base timer expires)
//
epicsTimerNotify::expireStatus exAsyncCreateIO::expire ()
epicsTimerNotify::expireStatus exAsyncCreateIO::expire ( const epicsTime & currentTime )
{
exPV *pPV;
src/cas/example/simple/exServer.h
+5 -5
View File
@@ -237,7 +237,7 @@ private:
//
// scan timer expire
//
expireStatus expire ();
expireStatus expire ( const epicsTime & currentTime );
//
// Std PV Attribute fetch support
@@ -397,7 +397,7 @@ private:
exAsyncPV &pv;
epicsTimer &timer;
smartConstGDDPointer pValue;
expireStatus expire ();
expireStatus expire ( const epicsTime & currentTime );
};
//
@@ -411,7 +411,7 @@ private:
exAsyncPV &pv;
epicsTimer &timer;
smartGDDPointer pProto;
expireStatus expire ();
expireStatus expire ( const epicsTime & currentTime );
};
//
@@ -427,7 +427,7 @@ private:
const pvInfo &pvi;
epicsTimer &timer;
exServer &cas;
expireStatus expire ();
expireStatus expire ( const epicsTime & currentTime );
};
@@ -445,7 +445,7 @@ private:
epicsTimer &timer;
exServer &cas;
bool scanOn;
expireStatus expire ();
expireStatus expire ( const epicsTime & currentTime );
};
//