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

clock: 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:52:38 +01:00
parent ec33010f56
commit b05991dbb8
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

@ -80,6 +80,7 @@ struct clock {
clockid_t clkid; clockid_t clkid;
struct servo *servo; struct servo *servo;
enum servo_type servo_type; enum servo_type servo_type;
int (*dscmp)(struct dataset *a, struct dataset *b);
struct defaultDS dds; struct defaultDS dds;
struct dataset default_dataset; struct dataset default_dataset;
struct currentDS cur; struct currentDS cur;
@ -1051,6 +1052,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,
} }
c->servo_state = SERVO_UNLOCKED; c->servo_state = SERVO_UNLOCKED;
c->servo_type = servo; c->servo_type = servo;
c->dscmp = dscmp;
c->tsproc = tsproc_create(config_get_int(config, NULL, "tsproc_mode"), c->tsproc = tsproc_create(config_get_int(config, NULL, "tsproc_mode"),
config_get_int(config, NULL, "delay_filter"), config_get_int(config, NULL, "delay_filter"),
config_get_int(config, NULL, "delay_filter_length")); config_get_int(config, NULL, "delay_filter_length"));
@ -1686,7 +1688,7 @@ static void handle_state_decision_event(struct clock *c)
fc = port_compute_best(piter); fc = port_compute_best(piter);
if (!fc) if (!fc)
continue; continue;
if (!best || dscmp(&fc->dataset, &best->dataset) > 0) if (!best || c->dscmp(&fc->dataset, &best->dataset) > 0)
best = fc; best = fc;
} }