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/libcom/src/osi/epicsThread.cpp
View File

@@ -164,7 +164,7 @@ bool epicsThread::exitWait ( const double delay ) throw ()
}
return true;
}
epicsTime exitWaitBegin = epicsTime::getCurrent ();
epicsTime exitWaitBegin = epicsTime::getMonotonic ();
double exitWaitElapsed = 0.0;
epicsGuard < epicsMutex > guard ( this->mutex );
this->cancel = true;
@@ -172,7 +172,7 @@ bool epicsThread::exitWait ( const double delay ) throw ()
epicsGuardRelease < epicsMutex > unguard ( guard );
this->event.signal ();
this->exitEvent.wait ( delay - exitWaitElapsed );
epicsTime current = epicsTime::getCurrent ();
epicsTime current = epicsTime::getMonotonic ();
exitWaitElapsed = current - exitWaitBegin;
}
if(this->terminated && !joined) {