chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct the TAI-UTC offset when it is reasonable to do so. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2012-08-27 18:57:43 +02:00
parent 1bfb6fd217
commit 3936316468
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clock.c
View File

@ -65,6 +65,7 @@ struct clock {
int fault_fd[CLK_N_PORTS]; int fault_fd[CLK_N_PORTS];
time_t fault_timeout; time_t fault_timeout;
int nports; /* does not include the UDS port */ int nports; /* does not include the UDS port */
int utc_timescale;
tmv_t master_offset; tmv_t master_offset;
tmv_t path_delay; tmv_t path_delay;
struct mave *avg_delay; struct mave *avg_delay;
@ -255,7 +256,7 @@ static void clock_update_grandmaster(struct clock *c)
c->tds.leap59 = FALSE; c->tds.leap59 = FALSE;
c->tds.timeTraceable = FALSE; c->tds.timeTraceable = FALSE;
c->tds.frequencyTraceable = FALSE; c->tds.frequencyTraceable = FALSE;
c->tds.ptpTimescale = TRUE; c->tds.ptpTimescale = c->utc_timescale ? FALSE : TRUE;
c->tds.timeSource = INTERNAL_OSCILLATOR; 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) static int forwarding(struct clock *c, struct port *p)
{ {
enum port_state ps = port_state(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 { } else {
c->clkid = CLOCK_REALTIME; c->clkid = CLOCK_REALTIME;
c->utc_timescale = 1;
max_adj = 512000; max_adj = 512000;
} }
@ -706,6 +727,8 @@ enum servo_state clock_synchronize(struct clock *c,
c->master_offset = tmv_sub(ingress, c->master_offset = tmv_sub(ingress,
tmv_add(origin, tmv_add(c->path_delay, tmv_add(c->c1, c->c2)))); 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); c->cur.offsetFromMaster = tmv_to_TimeInterval(c->master_offset);
if (!c->path_delay) if (!c->path_delay)