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

Log changes to asCapable 

Signed-off-by: Delio Brignoli <dbrignoli@audioscience.com>
master
Delio Brignoli 2013-03-17 05:29:57 +01:00 committed by Richard Cochran
parent 3cc285c691
commit 9650cb687d
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
port.c
View File

@ -75,6 +75,7 @@ struct port {
struct port_defaults pod; struct port_defaults pod;
struct PortIdentity portIdentity; struct PortIdentity portIdentity;
enum port_state state; /*portState*/ enum port_state state; /*portState*/
int asCapable;
Integer8 logMinDelayReqInterval; Integer8 logMinDelayReqInterval;
TimeInterval peerMeanPathDelay; TimeInterval peerMeanPathDelay;
Integer8 logAnnounceInterval; Integer8 logAnnounceInterval;
@ -379,17 +380,34 @@ static int port_capable(struct port *p)
{ {
if (!port_is_ieee8021as(p)) { if (!port_is_ieee8021as(p)) {
/* Normal 1588 ports are always capable. */ /* Normal 1588 ports are always capable. */
return 1; goto capable;
} }
if (tmv_to_nanoseconds(p->peer_delay) > p->neighborPropDelayThresh) { if (tmv_to_nanoseconds(p->peer_delay) > p->neighborPropDelayThresh) {
return 0; if (p->asCapable)
pr_debug("port %hu: peer_delay (%lld) > neighborPropDelayThresh "
"(%lld), resetting asCapable", portnum(p),
tmv_to_nanoseconds(p->peer_delay),
p->neighborPropDelayThresh);
goto not_capable;
} }
if (p->pdr_missing > ALLOWED_LOST_RESPONSES) { if (p->pdr_missing > ALLOWED_LOST_RESPONSES) {
return 0; if (p->asCapable)
pr_debug("port %hu: missed %d peer delay resp, "
"resetting asCapable", portnum(p), p->pdr_missing);
goto not_capable;
} }
capable:
if (!p->asCapable)
pr_debug("port %hu: setting asCapable", portnum(p));
p->asCapable = 1;
return 1; return 1;
not_capable:
p->asCapable = 0;
return 0;
} }
static int port_clr_tmo(int fd) static int port_clr_tmo(int fd)
@ -678,6 +696,7 @@ static void port_nrate_initialize(struct port *p)
/* We start in the 'incapable' state. */ /* We start in the 'incapable' state. */
p->pdr_missing = ALLOWED_LOST_RESPONSES + 1; p->pdr_missing = ALLOWED_LOST_RESPONSES + 1;
p->asCapable = 0;
p->nrate.origin1 = tmv_zero(); p->nrate.origin1 = tmv_zero();
p->nrate.ingress1 = tmv_zero(); p->nrate.ingress1 = tmv_zero();