Skip to content

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

userspace/snmpd: add wrsGwWatchdogTimeouts to wrsBootStatusGroup 

Add Number of times the watchdog has restarted the HDL module responsible
for the Ethernet switching process.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent a3fc48c0
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 0 deletions
userspace/snmpd/WR-SWITCH-MIB.txt
View file @ edab5c5f
......@@ -703,6 +703,15 @@ wrsBootUserspaceDaemonsMissing OBJECT-TYPE
are reported as maximum number of missing modules"
::= { wrsBootStatusGroup 14 }
wrsGwWatchdogTimeouts OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Number of times the watchdog has restarted the HDL module responsible
for the Ethernet switching process."
::= { wrsBootStatusGroup 15 }
-- wrsTemperatureGroup (.7.1.3)
wrsTemperatureGroup OBJECT IDENTIFIER ::= { wrsOperationStatus 3 }
......
userspace/snmpd/wrsBootStatusGroup.c
View file @ edab5c5f
......@@ -18,6 +18,9 @@
/* get process list, output only process' command */
#define PROCESS_COMMAND "/bin/ps axo command"
/* get number of GW watchdog timeouts */
#define WDOG_COMMAND "/wr/bin/wrs_watchdog -g"
/* Macros for fscanf function to read line with maximum of "x" characters
* without new line. Macro expands to something like: "%10[^\n]" */
#define LINE_READ_LEN_HELPER(x) "%"#x"[^\n]"
......@@ -42,6 +45,7 @@ static struct pickinfo wrsBootStatus_pickinfo[] = {
FIELD(wrsBootStatus_s, ASN_INTEGER, wrsBootLoadLM32),
FIELD(wrsBootStatus_s, ASN_INTEGER, wrsBootKernelModulesMissing),
FIELD(wrsBootStatus_s, ASN_INTEGER, wrsBootUserspaceDaemonsMissing),
FIELD(wrsBootStatus_s, ASN_COUNTER, wrsGwWatchdogTimeouts),
};
struct wrsBootStatus_s wrsBootStatus_s;
......@@ -456,6 +460,26 @@ static void get_daemons_status(void)
pclose(f);
}
static void get_n_watchdog_timouts(void)
{
FILE *f;
wrsBootStatus_s.wrsGwWatchdogTimeouts = 0;
f = popen(WDOG_COMMAND, "r");
if (!f) {
snmp_log(LOG_ERR, "SNMP: wrsBootStatusGroup failed to execute "
WDOG_COMMAND"\n");
return;
}
/* Number of watchdog restarts is returned as a int value,
* if error there nothing we can do */
fscanf(f, "%d", &wrsBootStatus_s.wrsGwWatchdogTimeouts);
pclose(f);
}
time_t wrsBootStatus_data_fill(void)
{
static time_t time_update;
......@@ -483,6 +507,9 @@ time_t wrsBootStatus_data_fill(void)
/* get info about running daemons */
get_daemons_status();
/* get info about number of gateware watchdog timeouts */
get_n_watchdog_timouts();
/* there was an update, return current time */
return time_update;
}
......
userspace/snmpd/wrsBootStatusGroup.h
View file @ edab5c5f
......@@ -53,6 +53,7 @@ struct wrsBootStatus_s {
int32_t wrsBootLoadLM32;
int32_t wrsBootKernelModulesMissing;
int32_t wrsBootUserspaceDaemonsMissing;
int32_t wrsGwWatchdogTimeouts;
};
extern struct wrsBootStatus_s wrsBootStatus_s;
......
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