67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
|
From 6ec4258a64383467322da227adfe4780a4777f3a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Miroslav Lichvar <mlichvar@redhat.com>
|
||
|
|
Date: Wed, 27 Aug 2014 16:47:19 +0200
|
||
|
|
Subject: [PATCH 04/12] timesyncd: get kernel timestamp in nanoseconds
|
||
|
|
|
||
|
|
(cherry picked from commit 487a36821ea214a73e1d0dcbd6d84123b50d1135)
|
||
|
|
---
|
||
|
|
src/timesync/timesyncd-manager.c | 14 +++++---------
|
||
|
|
1 file changed, 5 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
|
||
|
|
index 3339606..2b0580c 100644
|
||
|
|
--- a/src/timesync/timesyncd-manager.c
|
||
|
|
+++ b/src/timesync/timesyncd-manager.c
|
||
|
|
@@ -136,10 +136,6 @@ static double ts_to_d(const struct timespec *ts) {
|
||
|
|
return ts->tv_sec + (1.0e-9 * ts->tv_nsec);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static double tv_to_d(const struct timeval *tv) {
|
||
|
|
- return tv->tv_sec + (1.0e-6 * tv->tv_usec);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static double square(double d) {
|
||
|
|
return d * d;
|
||
|
|
}
|
||
|
|
@@ -500,7 +496,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
|
||
|
|
.msg_namelen = sizeof(server_addr),
|
||
|
|
};
|
||
|
|
struct cmsghdr *cmsg;
|
||
|
|
- struct timeval *recv_time;
|
||
|
|
+ struct timespec *recv_time;
|
||
|
|
ssize_t len;
|
||
|
|
double origin, receive, trans, dest;
|
||
|
|
double delay, offset;
|
||
|
|
@@ -543,8 +539,8 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
|
||
|
|
continue;
|
||
|
|
|
||
|
|
switch (cmsg->cmsg_type) {
|
||
|
|
- case SCM_TIMESTAMP:
|
||
|
|
- recv_time = (struct timeval *) CMSG_DATA(cmsg);
|
||
|
|
+ case SCM_TIMESTAMPNS:
|
||
|
|
+ recv_time = (struct timespec *) CMSG_DATA(cmsg);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -615,7 +611,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
|
||
|
|
origin = ts_to_d(&m->trans_time) + OFFSET_1900_1970;
|
||
|
|
receive = ntp_ts_to_d(&ntpmsg.recv_time);
|
||
|
|
trans = ntp_ts_to_d(&ntpmsg.trans_time);
|
||
|
|
- dest = tv_to_d(recv_time) + OFFSET_1900_1970;
|
||
|
|
+ dest = ts_to_d(recv_time) + OFFSET_1900_1970;
|
||
|
|
|
||
|
|
offset = ((receive - origin) + (trans - dest)) / 2;
|
||
|
|
delay = (dest - origin) - (trans - receive);
|
||
|
|
@@ -697,7 +693,7 @@ static int manager_listen_setup(Manager *m) {
|
||
|
|
if (r < 0)
|
||
|
|
return -errno;
|
||
|
|
|
||
|
|
- r = setsockopt(m->server_socket, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on));
|
||
|
|
+ r = setsockopt(m->server_socket, SOL_SOCKET, SO_TIMESTAMPNS, &on, sizeof(on));
|
||
|
|
if (r < 0)
|
||
|
|
return -errno;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|