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

port: Support slave event monitoring of Sync timing data. 

The monitoring module accepts Sync timing events.  This patch hooks up the
port receive path to call into the monitor.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2020-04-14 18:10:34 -07:00
parent 6f95c2e92c
commit 18bd3054ff
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
port.c
View File

@ -1156,6 +1156,7 @@ static void message_interval_request(struct port *p,
} }
static void port_synchronize(struct port *p, static void port_synchronize(struct port *p,
uint16_t seqid,
tmv_t ingress_ts, tmv_t ingress_ts,
struct timestamp origin_ts, struct timestamp origin_ts,
Integer64 correction1, Integer64 correction2, Integer64 correction1, Integer64 correction2,
@ -1172,6 +1173,17 @@ static void port_synchronize(struct port *p,
c2 = correction_to_tmv(correction2); c2 = correction_to_tmv(correction2);
t1c = tmv_add(t1, tmv_add(c1, c2)); t1c = tmv_add(t1, tmv_add(c1, c2));
switch (p->state) {
case PS_UNCALIBRATED:
case PS_SLAVE:
monitor_sync(p->slave_event_monitor,
clock_parent_identity(p->clock), seqid,
t1, tmv_add(c1, c2), t2);
break;
default:
break;
}
last_state = clock_servo_state(p->clock); last_state = clock_servo_state(p->clock);
state = clock_synchronize(p->clock, t2, t1c); state = clock_synchronize(p->clock, t2, t1c);
switch (state) { switch (state) {
@ -1251,7 +1263,8 @@ static void port_syfufsm(struct port *p, enum syfu_event event,
break; break;
case FUP_MATCH: case FUP_MATCH:
syn = p->last_syncfup; syn = p->last_syncfup;
port_synchronize(p, syn->hwts.ts, m->ts.pdu, port_synchronize(p, syn->header.sequenceId,
syn->hwts.ts, m->ts.pdu,
syn->header.correction, syn->header.correction,
m->header.correction, m->header.correction,
m->header.logMessageInterval); m->header.logMessageInterval);
@ -1271,7 +1284,8 @@ static void port_syfufsm(struct port *p, enum syfu_event event,
break; break;
case SYNC_MATCH: case SYNC_MATCH:
fup = p->last_syncfup; fup = p->last_syncfup;
port_synchronize(p, m->hwts.ts, fup->ts.pdu, port_synchronize(p, fup->header.sequenceId,
m->hwts.ts, fup->ts.pdu,
m->header.correction, m->header.correction,
fup->header.correction, fup->header.correction,
m->header.logMessageInterval); m->header.logMessageInterval);
@ -2297,7 +2311,8 @@ void process_sync(struct port *p, struct ptp_message *m)
m->header.correction += p->asymmetry; m->header.correction += p->asymmetry;
if (one_step(m)) { if (one_step(m)) {
port_synchronize(p, m->hwts.ts, m->ts.pdu, port_synchronize(p, m->header.sequenceId,
m->hwts.ts, m->ts.pdu,
m->header.correction, 0, m->header.correction, 0,
m->header.logMessageInterval); m->header.logMessageInterval);
flush_last_sync(p); flush_last_sync(p);
@ -3061,6 +3076,7 @@ struct port *port_open(const char *phc_device,
p->state = PS_INITIALIZING; p->state = PS_INITIALIZING;
p->delayMechanism = config_get_int(cfg, p->name, "delay_mechanism"); p->delayMechanism = config_get_int(cfg, p->name, "delay_mechanism");
p->versionNumber = PTP_VERSION; p->versionNumber = PTP_VERSION;
p->slave_event_monitor = clock_slave_monitor(clock);
if (number && unicast_client_initialize(p)) { if (number && unicast_client_initialize(p)) {
goto err_transport; goto err_transport;

3
port_private.h
View File

@ -24,6 +24,7 @@
#include "as_capable.h" #include "as_capable.h"
#include "clock.h" #include "clock.h"
#include "fsm.h" #include "fsm.h"
#include "monitor.h"
#include "msg.h" #include "msg.h"
#include "tmv.h" #include "tmv.h"
@ -150,6 +151,8 @@ struct port {
/* unicast service mode */ /* unicast service mode */
struct unicast_service *unicast_service; struct unicast_service *unicast_service;
int inhibit_multicast_service; int inhibit_multicast_service;
/* slave event monitoring */
struct monitor *slave_event_monitor;
}; };
#define portnum(p) (p->portIdentity.portNumber) #define portnum(p) (p->portIdentity.portNumber)