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

Merge remote-tracking branch 'lp-Com/use-monotonic' into 7.0

Browse Source 
* lp-Com/use-monotonic:
  VxWorks: Measure CPU time-base frequency if necessary
  replace most internal getCurrent() -> getMonotonic()
  dbScan periodic scan use monotonic time
  monotonic adapt to regular time APIs
This commit is contained in:
Michael Davidsaver
2019-10-06 20:10:20 -07:00
parent c131d6852d 2fb41d7a36
commit e257e30cc9
26 changed files with 114 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/database/src/ioc/db/dbPutNotifyBlocker.cpp
View File

@@ -144,12 +144,12 @@ void dbPutNotifyBlocker::initiatePutNotify (
break;
}
if ( beginTimeInit ) {
if ( epicsTime::getCurrent () - begin > 30.0 ) {
if ( epicsTime::getMonotonic () - begin > 30.0 ) {
throw cacChannel::requestTimedOut ();
}
}
else {
begin = epicsTime::getCurrent ();
begin = epicsTime::getMonotonic ();
beginTimeInit = true;
}
{

4
modules/database/src/ioc/db/dbScan.c
View File

@@ -787,7 +787,7 @@ static void periodicTask(void *arg)
taskwdInsert(0, NULL, NULL);
epicsEventSignal(startStopEvent);
epicsTimeGetCurrent(&next);
epicsTimeGetMonotonic(&next);
reported = next;
while (ppsl->scanCtl != ctlExit) {
@@ -798,7 +798,7 @@ static void periodicTask(void *arg)
scanList(&ppsl->scan_list);
epicsTimeAddSeconds(&next, ppsl->period);
epicsTimeGetCurrent(&now);
epicsTimeGetMonotonic(&now);
delay = epicsTimeDiffInSeconds(&next, &now);
if (delay <= 0.0) {
if (overtime == 0.0) {