Skip to content

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

Merge branch 'adam-snmp_tune'

parents 78b2d08c a2a2adcb
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 18 deletions
proto-ext-whiterabbit/wr-api.h
View file @ a5a85d39
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
#include <ppsi/lib.h> #include <ppsi/lib.h>
#include "wr-constants.h" #include "wr-constants.h"
#define WRS_PPSI_SHMEM_VERSION 11 /* peer is per-ppi, not per-chan */ #define WRS_PPSI_SHMEM_VERSION 12 /* remove n_err_rxtx_deltas from struct
* wr_servo_state */
/* /*
* This structure is used as extension-specific data in the DSPort * This structure is used as extension-specific data in the DSPort
...@@ -176,7 +177,6 @@ struct wr_servo_state { ...@@ -176,7 +177,6 @@ struct wr_servo_state {
uint32_t n_err_state; uint32_t n_err_state;
uint32_t n_err_offset; uint32_t n_err_offset;
uint32_t n_err_delta_rtt; 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 @ a5a85d39
...@@ -7,10 +7,8 @@ ...@@ -7,10 +7,8 @@
#define FIX_ALPHA_FRACBITS 40 #define FIX_ALPHA_FRACBITS 40
/* Define threshold values for SNMP */ /* Define threshold values for SNMP */
/* TODO: These values need to be tuned! */ #define SNMP_MAX_OFFSET_PS 1000
#define SNMP_MAX_OFFSET 1000000 #define SNMP_MAX_DELTA_RTT_PS 1000
#define SNMP_MAX_DELTA_RTT 1000000
#define SNMP_MAX_RXTX_DELTAS 1000000
static const char *servo_name[] = { static const char *servo_name[] = {
[WR_UNINITIALIZED] = "Uninitialized", [WR_UNINITIALIZED] = "Uninitialized",
...@@ -411,23 +409,15 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -411,23 +409,15 @@ int wr_servo_update(struct pp_instance *ppi)
s->n_err_state++; s->n_err_state++;
/* Increase number of servo updates with offset exceeded /* Increase number of servo updates with offset exceeded
* SNMP_MAX_OFFSET (Used by SNMP) */ * SNMP_MAX_OFFSET_PS (Used by SNMP) */
if (abs(s->offset) > SNMP_MAX_OFFSET) if (abs(s->offset) > SNMP_MAX_OFFSET_PS)
s->n_err_offset++; s->n_err_offset++;
/* Increase number of servo updates with delta rtt exceeded /* Increase number of servo updates with delta rtt exceeded
* SNMP_MAX_DELTA_RTT (Used by SNMP) */ * SNMP_MAX_DELTA_RTT_PS (Used by SNMP) */
if (abs(picos_mu_prev - s->picos_mu) > SNMP_MAX_DELTA_RTT) if (abs(picos_mu_prev - s->picos_mu) > SNMP_MAX_DELTA_RTT_PS)
s->n_err_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