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

Fix VxWorks time sync initialization bug

Browse Source
This commit is contained in:
Andrew Johnson
2022-06-14 16:07:39 -05:00
parent 2f8272d3a1
commit 9bb11e6e88
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/libcom/src/osi/os/vxWorks/osdTime.cpp
View File

@@ -63,15 +63,18 @@ static int timeRegister(void)
// Define EPICS_TS_FORCE_NTPTIME to force use of NTPTime provider
bool useNTP = getenv("EPICS_TS_FORCE_NTPTIME") != NULL;
if (!useNTP &&
(taskNameToId(sntp_sync_task) != ERROR ||
taskNameToId(ntp_daemon) != ERROR)) {
// A VxWorks 6 SNTP/NTP sync task is running
struct timespec clockNow;
if (!useNTP) {
if (taskNameToId(sntp_sync_task) != ERROR ||
taskNameToId(ntp_daemon) != ERROR) {
// A VxWorks 6 SNTP/NTP sync task is running
struct timespec clockNow;
useNTP = clock_gettime(CLOCK_REALTIME, &clockNow) != OK ||
clockNow.tv_sec < BUILD_TIME;
// Assumes VxWorks and the host OS have the same epoch
useNTP = clock_gettime(CLOCK_REALTIME, &clockNow) != OK ||
clockNow.tv_sec < BUILD_TIME;
// Assumes VxWorks and the host OS have the same epoch
}
else
useNTP = 1;
}
if (useNTP) {