Skip to content
Snippets Groups Projects
Commit 646783f1 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files

userspace/snmp: add Rx/Tx deltas to snmp


add to snmpd and MIB:
-WR-SWITCH-MIB::ppsiDeltaTxM
-WR-SWITCH-MIB::ppsiDeltaRxM
-WR-SWITCH-MIB::ppsiDeltaTxS
-WR-SWITCH-MIB::ppsiDeltaRxS

Signed-off-by: default avatarAdam Wujek <adam.wujek@cern.ch>
parent cc9fb7ab
No related merge requests found
...@@ -374,6 +374,38 @@ ppsiServoUpdates OBJECT-TYPE ...@@ -374,6 +374,38 @@ ppsiServoUpdates OBJECT-TYPE
"How many time did the servo run" "How many time did the servo run"
::= { wrsPpsiGlobals 13 } ::= { wrsPpsiGlobals 13 }
ppsiDeltaTxM OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Tx latency on Master side"
::= { wrsPpsiGlobals 14 }
ppsiDeltaRxM OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Rx latency on Master side"
::= { wrsPpsiGlobals 15 }
ppsiDeltaTxS OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Tx latency on Slave side"
::= { wrsPpsiGlobals 16 }
ppsiDeltaRxS OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fixed Rx latency on Slave side"
::= { wrsPpsiGlobals 17 }
-- per-port (.3.2) -- per-port (.3.2)
ppsiPort OBJECT-TYPE ppsiPort OBJECT-TYPE
......
...@@ -63,6 +63,10 @@ static struct wrs_p_globals { ...@@ -63,6 +63,10 @@ static struct wrs_p_globals {
int64_t rtt; int64_t rtt;
uint32_t llength; uint32_t llength;
uint32_t servo_updates; uint32_t servo_updates;
int32_t delta_tx_m;
int32_t delta_rx_m;
int32_t delta_tx_s;
int32_t delta_rx_s;
} wrs_p_globals; } wrs_p_globals;
static struct ppsi_pickinfo g_pickinfo[] = { static struct ppsi_pickinfo g_pickinfo[] = {
...@@ -80,6 +84,10 @@ static struct ppsi_pickinfo g_pickinfo[] = { ...@@ -80,6 +84,10 @@ static struct ppsi_pickinfo g_pickinfo[] = {
FIELD(wrs_p_globals, ASN_COUNTER64, rtt), FIELD(wrs_p_globals, ASN_COUNTER64, rtt),
FIELD(wrs_p_globals, ASN_UNSIGNED, llength), FIELD(wrs_p_globals, ASN_UNSIGNED, llength),
FIELD(wrs_p_globals, ASN_UNSIGNED, servo_updates), FIELD(wrs_p_globals, ASN_UNSIGNED, servo_updates),
FIELD(wrs_p_globals, ASN_INTEGER, delta_tx_m),
FIELD(wrs_p_globals, ASN_INTEGER, delta_rx_m),
FIELD(wrs_p_globals, ASN_INTEGER, delta_tx_s),
FIELD(wrs_p_globals, ASN_INTEGER, delta_rx_s),
}; };
/* Our data: per-port information */ /* Our data: per-port information */
...@@ -137,7 +145,10 @@ static void wrs_ppsi_get_globals(void) ...@@ -137,7 +145,10 @@ static void wrs_ppsi_get_globals(void)
wrs_p_globals.llength = (uint32_t)(ppsi_servo->delta_ms/1e12 * wrs_p_globals.llength = (uint32_t)(ppsi_servo->delta_ms/1e12 *
300e6 / 1.55); 300e6 / 1.55);
wrs_p_globals.servo_updates = ppsi_servo->update_count; wrs_p_globals.servo_updates = ppsi_servo->update_count;
wrs_p_globals.delta_tx_m = ppsi_servo->delta_tx_m;
wrs_p_globals.delta_rx_m = ppsi_servo->delta_rx_m;
wrs_p_globals.delta_tx_s = ppsi_servo->delta_tx_s;
wrs_p_globals.delta_rx_s = ppsi_servo->delta_rx_s;
retries++; retries++;
if (retries > 100) { if (retries > 100) {
snmp_log(LOG_ERR, "%s: too many retries to read PPSI\n", snmp_log(LOG_ERR, "%s: too many retries to read PPSI\n",
......
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