Instead of using a hard coded algorithm, let the caller provide the
function that performs the comparison. This will allow implementing
alternative algorithms from PTP profiles.
Signed-off-by: Richard Cochran <richardcoch...@gmail.com>
---
bmc.c | 9 +++++----
bmc.h | 6 ++++--
clock.c | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/bmc.c b/bmc.c
index 462a90d..4b435b2 100644
--- a/bmc.c
+++ b/bmc.c
@@ -120,7 +120,8 @@ int dscmp(struct dataset *a, struct dataset *b)
return diff < 0 ? A_BETTER : B_BETTER;
}
-enum port_state bmc_state_decision(struct clock *c, struct port *r)
+enum port_state bmc_state_decision(struct clock *c, struct port *r,
+ int (*compare)(struct dataset *a, struct
dataset *b))
{
struct dataset *clock_ds, *clock_best, *port_best;
enum port_state ps;
@@ -134,14 +135,14 @@ enum port_state bmc_state_decision(struct clock *c,
struct port *r)
return ps;
if (clock_class(c) <= 127) {
- if (dscmp(clock_ds, port_best) > 0) {
+ if (compare(clock_ds, port_best) > 0) {
return PS_GRAND_MASTER; /*M1*/
} else {
return PS_PASSIVE; /*P1*/
}
}
- if (dscmp(clock_ds, clock_best) > 0) {
+ if (compare(clock_ds, clock_best) > 0) {
return PS_GRAND_MASTER; /*M2*/
}
@@ -149,7 +150,7 @@ enum port_state bmc_state_decision(struct clock *c, struct
port *r)
return PS_SLAVE; /*S1*/
}
- if (dscmp(clock_best, port_best) == A_BETTER_TOPO) {
+ if (compare(clock_best, port_best) == A_BETTER_TOPO) {
return PS_PASSIVE; /*P2*/
} else {
return PS_MASTER; /*M3*/
diff --git a/bmc.h b/bmc.h
index 81b3ee6..23e7686 100644
--- a/bmc.h
+++ b/bmc.h
@@ -28,12 +28,14 @@
* BMC state decision algorithm.
* @param c The local clock.
* @param r The port in question.
+ * @param compare The data set comparison algorithm.
* @return A @ref port_state value as the recommended state.
*/
-enum port_state bmc_state_decision(struct clock *c, struct port *r);
+enum port_state bmc_state_decision(struct clock *c, struct port *r,
+ int (*comapre)(struct dataset *a, struct
dataset *b));
/**
- * Compare two data sets.
+ * Compare two data sets using the algorithm defined in IEEE 1588.
* @param a A dataset to compare.
* @param b A dataset to compare.
* @return An integer less than, equal to, or greater than zero
diff --git a/clock.c b/clock.c
index 7049706..4179931 100644
--- a/clock.c
+++ b/clock.c
@@ -1688,7 +1688,7 @@ static void handle_state_decision_event(struct clock *c)
LIST_FOREACH(piter, &c->ports, list) {
enum port_state ps;
enum fsm_event event;
- ps = bmc_state_decision(c, piter);
+ ps = bmc_state_decision(c, piter, c->dscmp);
switch (ps) {
case PS_LISTENING:
event = EV_NONE;
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxptp-devel mailing list
Linuxptp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
