Skip to content

P
PPSi
Commit 74a79aab authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

proto-ext-whiterabbit: Add SNMP counters and increase ppsi shmem version to 6 

Add counters used by SNMP:
--n_err_state (state different than WR_TRACK_PHASE)
--n_err_offset (offset exceeded SNMP_MAX_OFFSET)
--n_err_delta_rtt (delta rtt exceeded SNMP_MAX_DELTA_RTT)
--n_err_rxtx_deltas (any delta_*x_* bigger than SNMP_MAX_RXTX_DELTAS)
All these counters are increased on servo update if error condition is met

Due to above, increase WRS_PPSI_SHMEM_VERSION to 6
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 623dcf31
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 4 deletions
proto-ext-whiterabbit/wr-api.h
View file @ 74a79aab
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
#include <ppsi/lib.h> #include <ppsi/lib.h>
#include "wr-constants.h" #include "wr-constants.h"
#define WRS_PPSI_SHMEM_VERSION 5 /* added fields tx_count and rx_count to #define WRS_PPSI_SHMEM_VERSION 6 /* added fields n_err_state, n_err_offset,
* pp_instance */ * n_err_rtt, n_err_deltas to
* wr_servo_state_t */
/* /*
* This structure is used as extension-specific data in the DSPort * This structure is used as extension-specific data in the DSPort
...@@ -164,6 +165,13 @@ struct wr_servo_state { ...@@ -164,6 +165,13 @@ struct wr_servo_state {
char servo_state_name[32]; char servo_state_name[32];
int64_t skew; int64_t skew;
int64_t offset; int64_t offset;
/* Values used by snmp. Values are increased at servo update when
* erroneous condition occurs. */
uint32_t n_err_state;
uint32_t n_err_offset;
uint32_t n_err_delta_rtt;
uint32_t n_err_rxtx_deltas;
}; };
/* All data used as extension ppsi-wr must be put here */ /* All data used as extension ppsi-wr must be put here */
......
proto-ext-whiterabbit/wr-servo.c
View file @ 74a79aab
...@@ -13,6 +13,12 @@ ...@@ -13,6 +13,12 @@
#define FIX_ALPHA_FRACBITS 40 #define FIX_ALPHA_FRACBITS 40
/* Define threshold values for SNMP */
/* TODO: These values need to be tuned! */
#define SNMP_MAX_OFFSET 1000000
#define SNMP_MAX_DELTA_RTT 1000000
#define SNMP_MAX_RXTX_DELTAS 1000000
static const char *servo_name[] = { static const char *servo_name[] = {
[WR_SERVO_NONE] = "Uninitialized", [WR_SERVO_NONE] = "Uninitialized",
[WR_SYNC_NSEC] = "SYNC_NSEC", [WR_SYNC_NSEC] = "SYNC_NSEC",
...@@ -238,7 +244,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -238,7 +244,7 @@ int wr_servo_update(struct pp_instance *ppi)
uint64_t delay_ms_fix; uint64_t delay_ms_fix;
static int errcount; static int errcount;
int remaining_offset; int remaining_offset;
int64_t picos_mu_prev = 0;
TimeInternal ts_offset, ts_offset_hw /*, ts_phase_adjust */; TimeInternal ts_offset, ts_offset_hw /*, ts_phase_adjust */;
if(!got_sync) if(!got_sync)
...@@ -272,7 +278,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -272,7 +278,7 @@ int wr_servo_update(struct pp_instance *ppi)
dump_timestamp(ppi, "servo:t4", s->t4); dump_timestamp(ppi, "servo:t4", s->t4);
dump_timestamp(ppi, "->mdelay", s->mu); dump_timestamp(ppi, "->mdelay", s->mu);
} }
picos_mu_prev = s->picos_mu;
s->picos_mu = ts_to_picos(s->mu); s->picos_mu = ts_to_picos(s->mu);
big_delta_fix = s->delta_tx_m + s->delta_tx_s big_delta_fix = s->delta_tx_m + s->delta_tx_s
+ s->delta_rx_m + s->delta_rx_s; + s->delta_rx_m + s->delta_rx_s;
...@@ -403,6 +409,29 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -403,6 +409,29 @@ int wr_servo_update(struct pp_instance *ppi)
/* update string state name */ /* update string state name */
strcpy(s->servo_state_name, servo_name[s->state]); strcpy(s->servo_state_name, servo_name[s->state]);
/* Increase number of servo updates with state different than
* WR_TRACK_PHASE. (Used by SNMP) */
if (s->state != WR_TRACK_PHASE)
s->n_err_state++;
/* Increase number of servo updates with offset exceeded
* SNMP_MAX_OFFSET (Used by SNMP) */
if (s->offset > SNMP_MAX_OFFSET)
s->n_err_offset++;
/* Increase number of servo updates with delta rtt exceeded
* SNMP_MAX_DELTA_RTT (Used by SNMP) */
if (picos_mu_prev - s->picos_mu > SNMP_MAX_DELTA_RTT)
s->n_err_delta_rtt++;
/* Increase number of servo updates with delta_*x_* bigger than
* SNMP_MAX_RXTX_DELTAS. (Used by SNMP) */
if ((s->delta_tx_m > SNMP_MAX_RXTX_DELTAS)
|| (s->delta_rx_m > SNMP_MAX_RXTX_DELTAS)
|| (s->delta_tx_s > SNMP_MAX_RXTX_DELTAS)
|| (s->delta_rx_s > SNMP_MAX_RXTX_DELTAS))
s->n_err_rxtx_deltas++;
out: out:
/* shmem unlock */ /* shmem unlock */
wrs_shm_write(ppsi_head, WRS_SHM_WRITE_END); wrs_shm_write(ppsi_head, WRS_SHM_WRITE_END);
......
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