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

monitor: Add support for slave delay timing data TLV. 

The slave delay timing data TLV provides the delay time stamps along with
the associated correction field.  This patch introduces a method to allow
publication of these values to a remote monitor.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2020-04-16 14:24:19 -07:00
parent ef9d51a47d
commit 4466d7b8ab
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
monitor.c
View File

@ -21,6 +21,8 @@ struct monitor_message {
struct monitor {
struct port *dst_port;
struct slave_rx_sync_timing_data_tlv *sync_tlv;
struct slave_delay_timing_data_tlv *delay_tlv;
struct monitor_message delay;
struct monitor_message sync;
};
@ -79,6 +81,23 @@ static struct tlv_extra *monitor_init_message(struct monitor_message *mm,
return extra;
}
static int monitor_init_delay(struct monitor *monitor, struct address address)
{
const size_t tlv_size = sizeof(struct slave_delay_timing_data_tlv) +
sizeof(struct slave_delay_timing_record) * RECORDS_PER_MESSAGE;
struct tlv_extra *extra;
extra = monitor_init_message(&monitor->delay, monitor->dst_port,
TLV_SLAVE_DELAY_TIMING_DATA_NP, tlv_size,
address);
if (!extra) {
return -1;
}
monitor->delay_tlv = (struct slave_delay_timing_data_tlv *) extra->tlv;
return 0;
}
static int monitor_init_sync(struct monitor *monitor, struct address address)
{
const size_t tlv_size = sizeof(struct slave_rx_sync_timing_data_tlv) +
@ -120,7 +139,12 @@ struct monitor *monitor_create(struct config *config, struct port *dst)
monitor->dst_port = dst;
if (monitor_init_delay(monitor, address)) {
free(monitor);
return NULL;
}
if (monitor_init_sync(monitor, address)) {
msg_put(monitor->delay.msg);
free(monitor);
return NULL;
}
@ -128,8 +152,44 @@ struct monitor *monitor_create(struct config *config, struct port *dst)
return monitor;
}
int monitor_delay(struct monitor *monitor, struct PortIdentity source_pid,
uint16_t seqid, tmv_t t3, tmv_t corr, tmv_t t4)
{
struct slave_delay_timing_record *record;
struct ptp_message *msg;
if (!monitor_active(monitor)) {
return 0;
}
msg = monitor->delay.msg;
if (!pid_eq(&monitor->delay_tlv->sourcePortIdentity, &source_pid)) {
/* There was a change in remote master. Drop stale records. */
memcpy(&monitor->delay_tlv->sourcePortIdentity, &source_pid,
sizeof(monitor->delay_tlv->sourcePortIdentity));
monitor->delay.count = 0;
}
record = monitor->delay_tlv->record + monitor->delay.count;
record->sequenceId = seqid;
record->delayOriginTimestamp = tmv_to_Timestamp(t3);
record->totalCorrectionField = tmv_to_TimeInterval(corr);
record->delayResponseTimestamp = tmv_to_Timestamp(t4);
monitor->delay.count++;
if (monitor->delay.count == monitor->delay.records_per_msg) {
monitor->delay.count = 0;
return monitor_forward(monitor->dst_port, msg);
}
return 0;
}
void monitor_destroy(struct monitor *monitor)
{
if (monitor->delay.msg) {
msg_put(monitor->delay.msg);
}
if (monitor->sync.msg) {
msg_put(monitor->sync.msg);
}

3
monitor.h
View File

@ -14,6 +14,9 @@ struct monitor;
struct monitor *monitor_create(struct config *config, struct port *dst);
int monitor_delay(struct monitor *monitor, struct PortIdentity source_pid,
uint16_t seqid, tmv_t t3, tmv_t corr, tmv_t t4);
void monitor_destroy(struct monitor *monitor);
int monitor_sync(struct monitor *monitor, struct PortIdentity source_pid,