Skip to content

W
White Rabbit Switch - Software
Commit cc9fb7ab authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/snmp: add saturated version of clock_offset 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent d0dab56b
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 6 deletions
userspace/snmpd/WR-SWITCH-MIB.txt
View file @ cc9fb7ab
......@@ -334,13 +334,21 @@ ppsiClockOffsetPs OBJECT-TYPE
"Current clock offset from master, in picoseconds"
::= { wrsPpsiGlobals 8 }
ppsiClockOffsetPsHR OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Human Readable current clock offset from master, in picoseconds with saturation to integer"
::= { wrsPpsiGlobals 9 }
ppsiSkew OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The estimated change of master-to-slave delay, in picoseconds"
::= { wrsPpsiGlobals 9 }
::= { wrsPpsiGlobals 10 }
ppsiRTT OBJECT-TYPE
SYNTAX Counter64 -- does unsigned64 exits?
......@@ -348,7 +356,7 @@ ppsiRTT OBJECT-TYPE
STATUS current
DESCRIPTION
"The round-trip-time, from master, in picoseconds"
::= { wrsPpsiGlobals 10 }
::= { wrsPpsiGlobals 11 }
ppsiLinkLength OBJECT-TYPE
SYNTAX Unsigned32
......@@ -356,7 +364,7 @@ ppsiLinkLength OBJECT-TYPE
STATUS current
DESCRIPTION
"Estimated fiber length, from master-to-slave delay, in meters"
::= { wrsPpsiGlobals 11 }
::= { wrsPpsiGlobals 12 }
ppsiServoUpdates OBJECT-TYPE
SYNTAX Unsigned32
......@@ -364,7 +372,7 @@ ppsiServoUpdates OBJECT-TYPE
STATUS current
DESCRIPTION
"How many time did the servo run"
::= { wrsPpsiGlobals 12 }
::= { wrsPpsiGlobals 13 }
-- per-port (.3.2)
......
userspace/snmpd/wrsPpsi.c
View file @ cc9fb7ab
......@@ -57,6 +57,8 @@ static struct wrs_p_globals {
int tracking_enabled;
char sync_source[32]; /* FIXME: not implemented */
int64_t clock_offset;
int32_t clock_offsetHR; /* Human readable version of clock_offset,
* saturated to int limits */
int32_t skew;
int64_t rtt;
uint32_t llength;
......@@ -73,6 +75,7 @@ static struct ppsi_pickinfo g_pickinfo[] = {
FIELD(wrs_p_globals, ASN_INTEGER, tracking_enabled),
FIELD(wrs_p_globals, ASN_OCTET_STR, sync_source),
FIELD(wrs_p_globals, ASN_COUNTER64, clock_offset),
FIELD(wrs_p_globals, ASN_INTEGER, clock_offsetHR),
FIELD(wrs_p_globals, ASN_INTEGER, skew),
FIELD(wrs_p_globals, ASN_COUNTER64, rtt),
FIELD(wrs_p_globals, ASN_UNSIGNED, llength),
......@@ -95,6 +98,16 @@ static struct ppsi_pickinfo p_pickinfo[] = {
FIELD(wrs_p_perport, ASN_OCTET_STR, peer_id),
};
static int32_t int_saturate(int64_t value)
{
if (value >= INT32_MAX)
return INT32_MAX;
else if (value <= INT32_MIN)
return INT32_MIN;
return value;
}
static void wrs_ppsi_get_globals(void)
{
unsigned ii;
......@@ -109,9 +122,18 @@ static void wrs_ppsi_get_globals(void)
sizeof(ppsi_servo->servo_state_name));
wrs_p_globals.servo_state = ppsi_servo->state;
wrs_p_globals.tracking_enabled = ppsi_servo->tracking_enabled;
wrs_p_globals.clock_offset = ppsi_servo->offset;
/*
* WARNING: the current snmpd is bugged: it has
* endianness problems with 64 bit, and the two
* halves are swapped. So pre-swap them here
*/
wrs_p_globals.rtt = (ppsi_servo->picos_mu << 32)
| (ppsi_servo->picos_mu >> 32);
wrs_p_globals.clock_offset = (ppsi_servo->offset << 32)
| (ppsi_servo->offset >> 32);
wrs_p_globals.clock_offsetHR =
int_saturate(ppsi_servo->offset);
wrs_p_globals.skew = ppsi_servo->skew;
wrs_p_globals.rtt = ppsi_servo->picos_mu;
wrs_p_globals.llength = (uint32_t)(ppsi_servo->delta_ms/1e12 *
300e6 / 1.55);
wrs_p_globals.servo_updates = ppsi_servo->update_count;
......
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