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

bugfix: use a sensible test to detect a new master. 

The code to detect a new master used pointer equality using a stale
pointer within the clock instance. Instead, the clock needs to remember
the identity of the foreign master in order to correctly detect a
change of master.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2012-09-12 17:06:34 +02:00
parent 9edd319f11
commit d4e761138e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clock.c
View File

@ -61,6 +61,7 @@ struct clock {
struct timePropertiesDS tds; struct timePropertiesDS tds;
struct ClockIdentity ptl[PATH_TRACE_MAX]; struct ClockIdentity ptl[PATH_TRACE_MAX];
struct foreign_clock *best; struct foreign_clock *best;
struct ClockIdentity best_id;
struct port *port[CLK_N_PORTS]; struct port *port[CLK_N_PORTS];
struct pollfd pollfd[CLK_N_PORTS*N_CLOCK_PFD]; struct pollfd pollfd[CLK_N_PORTS*N_CLOCK_PFD];
int fault_fd[CLK_N_PORTS]; int fault_fd[CLK_N_PORTS];
@ -836,13 +837,14 @@ static void handle_state_decision_event(struct clock *c)
pr_notice("selected best master clock %s", pr_notice("selected best master clock %s",
cid2str(&best->dataset.identity)); cid2str(&best->dataset.identity));
if (c->best != best) { if (!cid_eq(&best->dataset.identity, &c->best_id)) {
clock_freq_est_reset(c); clock_freq_est_reset(c);
mave_reset(c->avg_delay); mave_reset(c->avg_delay);
fresh_best = 1; fresh_best = 1;
} }
c->best = best; c->best = best;
c->best_id = best->dataset.identity;
for (i = 0; i < c->nports; i++) { for (i = 0; i < c->nports; i++) {
enum port_state ps; enum port_state ps;