From 39363164683ca966c5dbaab443c6517e45963382 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Mon, 27 Aug 2012 18:57:43 +0200 Subject: [PATCH] Correct the TAI-UTC offset when it is reasonable to do so. Signed-off-by: Richard Cochran --- clock.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/clock.c b/clock.c index 27ba3c2..d0c6d9c 100644 --- a/clock.c +++ b/clock.c @@ -65,6 +65,7 @@ struct clock { int fault_fd[CLK_N_PORTS]; time_t fault_timeout; int nports; /* does not include the UDS port */ + int utc_timescale; tmv_t master_offset; tmv_t path_delay; struct mave *avg_delay; @@ -255,7 +256,7 @@ static void clock_update_grandmaster(struct clock *c) c->tds.leap59 = FALSE; c->tds.timeTraceable = FALSE; c->tds.frequencyTraceable = FALSE; - c->tds.ptpTimescale = TRUE; + c->tds.ptpTimescale = c->utc_timescale ? FALSE : TRUE; c->tds.timeSource = INTERNAL_OSCILLATOR; } @@ -284,6 +285,25 @@ static void clock_update_slave(struct clock *c) } } +static void clock_utc_correct(struct clock *c) +{ + struct timespec offset; + if (!c->utc_timescale) + return; + if (!c->tds.ptpTimescale) + return; + if (c->tds.currentUtcOffsetValid && c->tds.timeTraceable) { + offset.tv_sec = c->tds.currentUtcOffset; + } else if (c->tds.currentUtcOffset > CURRENT_UTC_OFFSET) { + offset.tv_sec = c->tds.currentUtcOffset; + } else { + offset.tv_sec = CURRENT_UTC_OFFSET; + } + offset.tv_nsec = 0; + /* Local clock is UTC, but master is TAI. */ + c->master_offset = tmv_add(c->master_offset, timespec_to_tmv(offset)); +} + static int forwarding(struct clock *c, struct port *p) { enum port_state ps = port_state(p); @@ -341,6 +361,7 @@ struct clock *clock_create(int phc_index, struct interface *iface, int count, } } else { c->clkid = CLOCK_REALTIME; + c->utc_timescale = 1; max_adj = 512000; } @@ -706,6 +727,8 @@ enum servo_state clock_synchronize(struct clock *c, c->master_offset = tmv_sub(ingress, tmv_add(origin, tmv_add(c->path_delay, tmv_add(c->c1, c->c2)))); + clock_utc_correct(c); + c->cur.offsetFromMaster = tmv_to_TimeInterval(c->master_offset); if (!c->path_delay)