Merge lp://staging/~epics-core/epics-base/monotonictime into lp://staging/~epics-core/epics-base/3.16
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | mdavidsaver | ||||
Proposed branch: | lp://staging/~epics-core/epics-base/monotonictime | ||||
Merge into: | lp://staging/~epics-core/epics-base/3.16 | ||||
Diff against target: |
416 lines (+262/-1) 12 files modified
src/libCom/osi/Makefile (+1/-0) src/libCom/osi/epicsTime.h (+11/-0) src/libCom/osi/os/Darwin/osdMonotonic.c (+32/-0) src/libCom/osi/os/Darwin/osdTime.cpp (+3/-0) src/libCom/osi/os/RTEMS/osdTime.cpp (+3/-0) src/libCom/osi/os/WIN32/osdMonotonic.c (+53/-0) src/libCom/osi/os/WIN32/osdTime.cpp (+3/-0) src/libCom/osi/os/iOS/osdMonotonic.c (+31/-0) src/libCom/osi/os/posix/osdMonotonic.c (+75/-0) src/libCom/osi/os/posix/osdTime.cpp (+3/-0) src/libCom/osi/os/vxWorks/osdTime.cpp (+3/-0) src/libCom/test/epicsTimeTest.cpp (+44/-1) |
||||
To merge this branch: | bzr merge lp://staging/~epics-core/epics-base/monotonictime | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
mdavidsaver | Disapprove | ||
Review via email:
|
Description of the change
As per lp:1392516 add a function epicsMonotonicGet() which returns the time in nanoseconds (epicsUInt64) since some unspecified local reference time.
Implementations for posix (clock_gettime w/ CLOCK_MONOTONIC), windows (QueryPerforman
Also adds epicsMonotonicR
Unmerged revisions
- 12681. By mdavidsaver
-
move EPICS_EXPOSE_
LIBCOM_ MONOTONIC_ PRIVATE before all local includes - 12680. By mdavidsaver
-
libCom/osi: fetch monotonic time
Documentation waiting on review of function names.