diff --git a/doc/wrs_failures/fail.tex b/doc/wrs_failures/fail.tex index be3e927f5232594e05e4722abff75f395bf6dd2a..44380614cbdc010a507e453ba70a278b401a9f5b 100644 --- a/doc/wrs_failures/fail.tex +++ b/doc/wrs_failures/fail.tex @@ -706,6 +706,7 @@ list of faults leading to a data error. \snmpadd{WR-SWITCH-MIB::wrsStartCntSnmpd}\\ \snmpadd{WR-SWITCH-MIB::wrsStartCntSyslogd}\\ \snmpadd{WR-SWITCH-MIB::wrsStartCntWrsWatchdog}\\ + \snmpadd{WR-SWITCH-MIB::wrsStartCntLldpd}\\ \snmpadd{WR-SWITCH-MIB::wrsStartCntSPLL}\\ \snmpadd{WR-SWITCH-MIB::wrsBootUserspaceDaemonsMissing}\\ \snmpadd{WR-SWITCH-MIB::wrsBootSuccessful} \\ diff --git a/doc/wrs_failures/snmp_objects.tex b/doc/wrs_failures/snmp_objects.tex index 84c3534cdd065f204f66ea9d95a3fe46a0b4b2ff..f3bf351138f7c3b6a763ae00586ea9171c223a00 100644 --- a/doc/wrs_failures/snmp_objects.tex +++ b/doc/wrs_failures/snmp_objects.tex @@ -506,6 +506,7 @@ \snmpentrye{WR-SWITCH-MIB}{wrsStartCntGroup}{wrsStartCntSnmpd}{} \snmpentrye{WR-SWITCH-MIB}{wrsStartCntGroup}{wrsStartCntSyslogd}{} \snmpentrye{WR-SWITCH-MIB}{wrsStartCntGroup}{wrsStartCntWrsWatchdog}{} + \snmpentrye{WR-SWITCH-MIB}{wrsStartCntGroup}{wrsStartCntLldpd}{} \snmpentrye{WR-SWITCH-MIB}{wrsStartCntGroup}{wrsStartCntSPLL}{Not implemented} \snmpentrye{WR-SWITCH-MIB}{}{wrsSpllState}{} diff --git a/userspace/snmpd/WR-SWITCH-MIB.txt b/userspace/snmpd/WR-SWITCH-MIB.txt index 732becbea91614e68630a224f0e3cf518fa468db..5c907385034b56724624690243fc05094a9b4984 100644 --- a/userspace/snmpd/WR-SWITCH-MIB.txt +++ b/userspace/snmpd/WR-SWITCH-MIB.txt @@ -18,13 +18,17 @@ IMPORTS -- (I follow the CamelCase to be sure I don't mistype. Who knows the rules... wrSwitchMIB MODULE-IDENTITY - LAST-UPDATED "201602171600Z" + LAST-UPDATED "201807181400Z" ORGANIZATION "CERN" CONTACT-INFO "postal: BE-CO-HT, CERN, Geneva email: ht-drivers@cern.ch " DESCRIPTION "White Rabbit Switch internal details " + REVISION "201807181400Z" + DESCRIPTION + "Add wrsStartCntLldpd" + REVISION "201602171600Z" DESCRIPTION "Use 64bit counters for pstats. Make wrsPstats* obsolete, @@ -1146,6 +1150,14 @@ wrsStartCntWrsWatchdog OBJECT-TYPE "Number of wrs_watchdog daemon starts" ::= { wrsStartCntGroup 8 } +wrsStartCntLldpd OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of LLDP daemon starts" + ::= { wrsStartCntGroup 9 } + -- wrsSpllState (.7.3) wrsSpllState OBJECT IDENTIFIER ::= { wrsExpertStatus 3 } diff --git a/userspace/snmpd/wrsStartCntGroup.c b/userspace/snmpd/wrsStartCntGroup.c index a550f775da6fb0a44faac6d851b423792193b1a0..4b1509d18f66798ae16b744a44549f19ad241f30 100644 --- a/userspace/snmpd/wrsStartCntGroup.c +++ b/userspace/snmpd/wrsStartCntGroup.c @@ -7,6 +7,7 @@ #define START_CNT_SNMPD "/tmp/start_cnt_snmpd" #define START_CNT_SYSLOGD "/tmp/start_cnt_syslogd" #define START_CNT_WRSWATCHDOG "/tmp/start_cnt_wrs_watchdog" +#define START_CNT_LLDPD "/tmp/start_cnt_lldpd" static struct pickinfo wrsStartCnt_pickinfo[] = { FIELD(wrsStartCnt_s, ASN_COUNTER, wrsStartCntHAL), @@ -17,6 +18,7 @@ static struct pickinfo wrsStartCnt_pickinfo[] = { FIELD(wrsStartCnt_s, ASN_COUNTER, wrsStartCntSnmpd), FIELD(wrsStartCnt_s, ASN_COUNTER, wrsStartCntSyslogd), FIELD(wrsStartCnt_s, ASN_COUNTER, wrsStartCntWrsWatchdog), + FIELD(wrsStartCnt_s, ASN_COUNTER, wrsStartCntLldpd), }; struct wrsStartCnt_s wrsStartCnt_s; @@ -74,6 +76,7 @@ time_t wrsStartCnt_data_fill(void){ read_start_count(START_CNT_SNMPD, &wrsStartCnt_s.wrsStartCntSnmpd); read_start_count(START_CNT_SYSLOGD, &wrsStartCnt_s.wrsStartCntSyslogd); read_start_count(START_CNT_WRSWATCHDOG, &wrsStartCnt_s.wrsStartCntWrsWatchdog); + read_start_count(START_CNT_LLDPD, &wrsStartCnt_s.wrsStartCntLldpd); /* there was an update, return current time */ return time_update; diff --git a/userspace/snmpd/wrsStartCntGroup.h b/userspace/snmpd/wrsStartCntGroup.h index 9af5c4bcc5704a6d6af817b3a3db48d8cc0afcbb..11ed6b863efbc943d4337c8eb68085ab8a1482a6 100644 --- a/userspace/snmpd/wrsStartCntGroup.h +++ b/userspace/snmpd/wrsStartCntGroup.h @@ -13,6 +13,7 @@ struct wrsStartCnt_s { uint32_t wrsStartCntSnmpd; uint32_t wrsStartCntSyslogd; uint32_t wrsStartCntWrsWatchdog; + uint32_t wrsStartCntLldpd; }; extern struct wrsStartCnt_s wrsStartCnt_s;