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

telecom: Add a configuration option for G.8275.defaultDS.localPriority. 

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

3
clock.c
View File

@ -931,7 +931,8 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c->dds.flags & DDS_SLAVE_ONLY) { c->dds.flags & DDS_SLAVE_ONLY) {
c->dds.clockQuality.clockClass = 255; c->dds.clockQuality.clockClass = 255;
} }
c->default_dataset.localPriority = 128; c->default_dataset.localPriority =
config_get_int(config, NULL, "G.8275.defaultDS.localPriority");
/* Harmonize the twoStepFlag with the time_stamping option. */ /* Harmonize the twoStepFlag with the time_stamping option. */
if (config_harmonize_onestep(config)) { if (config_harmonize_onestep(config)) {

1
config.c
View File

@ -192,6 +192,7 @@ struct config_item config_tab[] = {
PORT_ITEM_INT("follow_up_info", 0, 0, 1), PORT_ITEM_INT("follow_up_info", 0, 0, 1),
GLOB_ITEM_INT("free_running", 0, 0, 1), GLOB_ITEM_INT("free_running", 0, 0, 1),
PORT_ITEM_INT("freq_est_interval", 1, 0, INT_MAX), PORT_ITEM_INT("freq_est_interval", 1, 0, INT_MAX),
GLOB_ITEM_INT("G.8275.defaultDS.localPriority", 128, 1, UINT8_MAX),
GLOB_ITEM_INT("gmCapable", 1, 0, 1), GLOB_ITEM_INT("gmCapable", 1, 0, 1),
PORT_ITEM_INT("hybrid_e2e", 0, 0, 1), PORT_ITEM_INT("hybrid_e2e", 0, 0, 1),
PORT_ITEM_INT("ignore_transport_specific", 0, 0, 1), PORT_ITEM_INT("ignore_transport_specific", 0, 0, 1),

1
default.cfg
View File

@ -15,6 +15,7 @@ free_running 0
freq_est_interval 1 freq_est_interval 1
dscp_event 0 dscp_event 0
dscp_general 0 dscp_general 0
G.8275.defaultDS.localPriority 128
# #
# Port Data Set # Port Data Set
# #

1
gPTP.cfg
View File

@ -13,6 +13,7 @@ clockAccuracy 0xFE
offsetScaledLogVariance 0xFFFF offsetScaledLogVariance 0xFFFF
free_running 0 free_running 0
freq_est_interval 1 freq_est_interval 1
G.8275.defaultDS.localPriority 128
# #
# Port Data Set # Port Data Set
# #

14
ptp4l.8
View File

@ -341,6 +341,20 @@ The offsetScaledLogVariance attribute of the local clock. It characterizes the
stability of the clock. stability of the clock.
The default is 0xFFFF. The default is 0xFFFF.
.TP .TP
.B G.8275.defaultDS.localPriority
The Telecom Profiles (ITU-T G.8275.1 and G.8275.2) specify an
alternate Best Master Clock Algorithm (BMCA) with a unique data set
comparison algorithm. The value of this option is associated with the
local clock and is used as a tie breaker whenever clockClass,
clockAccuracy, offsetScaledLogVariance, and priority2 are equal. This
option is only used when "dataset_comparison" is set to "telecom".
The default value is 128.
Warning: the BMCA is guaranteed to produce a spanning tree (that is, a
timing network without loops) only when using the default values of
G.8275.defaultDS.localPriority and G.8275.portDS.localPriority.
Careful network engineering is needed when using non-default values.
.TP
.B domainNumber .B domainNumber
The domain attribute of the local clock. The domain attribute of the local clock.
The default is 0. The default is 0.