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

Revert "replace most internal getCurrent() -> getMonotonic()"

Browse Source 
This reverts commit 4f2228fb1d
except for some test code.
This commit is contained in:
Michael Davidsaver
2020-04-23 15:43:34 -07:00
parent 85d1982890
commit f1cbe93b6c
15 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/libcom/src/timer/timer.cpp
View File

@@ -54,7 +54,7 @@ void timer::destroy ()
void timer::start ( epicsTimerNotify & notify, double delaySeconds )
{
this->start ( notify, epicsTime::getMonotonic () + delaySeconds );
this->start ( notify, epicsTime::getCurrent () + delaySeconds );
}
void timer::start ( epicsTimerNotify & notify, const epicsTime & expire )
@@ -129,7 +129,7 @@ void timer::privateStart ( epicsTimerNotify & notify, const epicsTime & expire )
debugPrintf ( ("Start of \"%s\" with delay %f at %p preempting %u\n",
typeid ( this->notify ).name (),
expire - epicsTime::getMonotonic (),
expire - epicsTime::getCurrent (),
this, preemptCount ) );
}
@@ -190,7 +190,7 @@ void timer::show ( unsigned int level ) const
double delay;
if ( this->curState == statePending || this->curState == stateActive ) {
try {
delay = this->exp - epicsTime::getMonotonic();
delay = this->exp - epicsTime::getCurrent();
}
catch ( ... ) {
delay = - DBL_MAX;