mirror of
https://github.com/clearlinux/systemd-stable.git
synced 2026-11-18 19:23:03 +00:00
timesyncd: get kernel timestamp in nanoseconds
Upstream commit:
commit 487a36821e
Author: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed Aug 27 16:47:19 2014 +0200
timesyncd: get kernel timestamp in nanoseconds
This commit is contained in:
@@ -144,10 +144,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;
|
||||
}
|
||||
@@ -565,7 +561,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;
|
||||
@@ -608,8 +604,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;
|
||||
}
|
||||
}
|
||||
@@ -680,7 +676,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);
|
||||
@@ -762,7 +758,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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user