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

4
modules/libcom/src/timer/timerQueue.cpp
View File

@@ -30,7 +30,7 @@ timerQueue::timerQueue ( epicsTimerQueueNotify & notifyIn ) :
pExpireTmr ( 0 ),
processThread ( 0 ),
exceptMsgTimeStamp (
epicsTime :: getMonotonic () - exceptMsgMinPeriod ),
epicsTime :: getCurrent () - exceptMsgMinPeriod ),
cancelPending ( false )
{
}
@@ -49,7 +49,7 @@ void timerQueue ::
char date[64];
double delay;
try {
epicsTime cur = epicsTime :: getMonotonic ();
epicsTime cur = epicsTime :: getCurrent ();
delay = cur - this->exceptMsgTimeStamp;
cur.strftime ( date, sizeof ( date ),
"%a %b %d %Y %H:%M:%S.%f" );