Skip to content

W
White Rabbit Switch - Software
Commit 82af3699 authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

WR extension: Populate raw delayMM in snmp and in wr_mon 

snmp: For WR extension, wrsPtpRTT is set with rawDelayMM
wr_mon: For WR extension, the value of delayMM displayed correspond to rawDelayMM
parent 612c8bc6
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 14 deletions
ppsi @ 90c53207
Subproject commit 9bdd491371fa9f6b470c5d305da39ef3447d7569
Subproject commit 90c532075ee03fc8edab48e06a827c9c851a2459
userspace/snmpd/wrsPtpDataTable.c
View file @ 82af3699
......@@ -167,10 +167,6 @@ time_t wrsPtpDataTable_data_fill(unsigned int *n_rows)
ptp_a[si].wrsPtpClockOffsetPsHR =
int_saturate(ptp_a[si].wrsPtpClockOffsetPs);
/* wrsPtpRTT */
ptp_a[si].wrsPtpRTT = 2*
pp_time_to_picos(&ppsi_servo->meanDelay);
/* wrsPtpLinkLength */
ptp_a[si].wrsPtpLinkLength =
(uint32_t)(pp_time_to_picos(&ppsi_servo->delayMS)
......@@ -190,8 +186,7 @@ time_t wrsPtpDataTable_data_fill(unsigned int *n_rows)
ppsi_i->protocol_extension;
/******** from extensions-specific ************/
if (ppsi_i->protocol_extension == PPSI_EXT_WR)
{
if (ppsi_i->protocol_extension == PPSI_EXT_WR) {
wr_d = (struct wr_data *)
wrs_shm_follow(ppsi_head,
ppsi_i->ext_data);
......@@ -236,9 +231,11 @@ time_t wrsPtpDataTable_data_fill(unsigned int *n_rows)
/* wrsPtpRTTErrCnt */
ptp_a[si].wrsPtpRTTErrCnt =
wrh_servo->n_err_delta_rtt;
}
else
{
/* wrsPtpRTT */
ptp_a[si].wrsPtpRTT = pp_time_to_picos(&wr_servo->rawDelayMM);
} else {
memset(ptp_a[si].wrsPtpSyncSource,
0, 32 * sizeof(char));
......@@ -251,6 +248,9 @@ time_t wrsPtpDataTable_data_fill(unsigned int *n_rows)
ptp_a[si].wrsPtpServoStateErrCnt = 0;
ptp_a[si].wrsPtpClockOffsetErrCnt = 0;
ptp_a[si].wrsPtpRTTErrCnt = 0;
/* wrsPtpRTT */
ptp_a[si].wrsPtpRTT = 2 * pp_time_to_picos(&ppsi_servo->meanDelay);
}
/* look for next PTP Instance in Slave state*/
si++;
......
userspace/tools/wr_mon.c
View file @ 82af3699
......@@ -840,7 +840,7 @@ void show_servo(struct inst_servo_t *servo, int alive)
{
wrh_servo_t * wr_servo;
wr_servo_ext_t * wr_servo_ext;
wr_servo_ext_t * wr_servo_ext=NULL;
char buf[128];
wrh_servo_t * l1e_servo;
......@@ -895,9 +895,13 @@ void show_servo(struct inst_servo_t *servo, int alive)
term_cprintf(C_CYAN," | ");term_cprintf(C_BLUE, "delayMS : ");
term_cprintf(C_WHITE,"%s\n",optimized_pp_time_toString(&servo->servo_snapshot.delayMS,buf));
term_cprintf(C_CYAN," | ");term_cprintf(C_BLUE, "delayMM : ");
term_cprintf(C_WHITE,"%s\n",optimized_pp_time_toString(&servo->servo_snapshot.delayMM,buf));
{
struct pp_time *delayMM= wr_servo_ext ?
&wr_servo_ext->rawDelayMM :
&servo->servo_snapshot.delayMM;
term_cprintf(C_CYAN," | ");term_cprintf(C_BLUE, "delayMM : ");
term_cprintf(C_WHITE,"%s\n",optimized_pp_time_toString(delayMM,buf));
}
//term_cprintf(C_BLUE, "Estimated link length: ");
/* (RTT - deltas) / 2 * c / ri
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment