From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 7 Mar 2015 23:04:03 +0000 (+0000)
Subject: [Bug 2782] Refactor refclock_shm.c, add memory barrier protection
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ef184b9e351173ea1761a6672b0da33ff05016f;p=thirdparty%2Fntp.git

[Bug 2782] Refactor refclock_shm.c, add memory barrier protection

bk: 54fb83e34OI4ziYyO5_1CwxDwAPpDw
---

diff --git a/ntpd/refclock_shm.c b/ntpd/refclock_shm.c
index 5be0889b3..270b6cfd6 100644
--- a/ntpd/refclock_shm.c
+++ b/ntpd/refclock_shm.c
@@ -391,7 +391,12 @@ static enum segstat_t shm_query(volatile struct shmTime *shm_in, struct shm_stat
 
     /*@-type@*//* splint is confused about struct timespec */
     shm_stat->tvc.tv_sec = shm_stat->tvc.tv_nsec = 0;
-    get_ostime(&shm_stat->tvc);
+    {
+	time_t now;
+
+	time(&now);
+	shm_stat->tvc.tv_sec = now;
+    }
 
     /* relying on word access to be atomic here */
     if (shm->valid == 0) {