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

port: Make the data set comparison algorithm into a function variable. 

This will allow adding alternative algorithms as defined in PTP profiles.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2017-02-14 16:51:04 +01:00
parent d14f11fd32
commit ec33010f56
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
port.c
View File

@ -106,6 +106,7 @@ struct port {
unsigned int multiple_pdr_detected; unsigned int multiple_pdr_detected;
enum port_state (*state_machine)(enum port_state state, enum port_state (*state_machine)(enum port_state state,
enum fsm_event event, int mdiff); enum fsm_event event, int mdiff);
int (*dscmp)(struct dataset *a, struct dataset *b);
/* portDS */ /* portDS */
struct PortIdentity portIdentity; struct PortIdentity portIdentity;
enum port_state state; /*portState*/ enum port_state state; /*portState*/
@ -2279,7 +2280,7 @@ struct foreign_clock *port_compute_best(struct port *p)
if (!p->best) if (!p->best)
p->best = fc; p->best = fc;
else if (dscmp(&fc->dataset, &p->best->dataset) > 0) else if (p->dscmp(&fc->dataset, &p->best->dataset) > 0)
p->best = fc; p->best = fc;
else else
fc_clear(fc); fc_clear(fc);
@ -2860,6 +2861,7 @@ struct port *port_open(int phc_index,
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
p->state_machine = clock_slave_only(clock) ? ptp_slave_fsm : ptp_fsm; p->state_machine = clock_slave_only(clock) ? ptp_slave_fsm : ptp_fsm;
p->dscmp = dscmp;
p->phc_index = phc_index; p->phc_index = phc_index;
p->jbod = config_get_int(cfg, interface->name, "boundary_clock_jbod"); p->jbod = config_get_int(cfg, interface->name, "boundary_clock_jbod");
transport = config_get_int(cfg, interface->name, "network_transport"); transport = config_get_int(cfg, interface->name, "network_transport");