ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stats: refactor

Browse Source 
Type: refactor
Change-Id: Ifd533a095d979dc55bfbe5fac7e0b7510a4d900c
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2022-03-01 15:51:18 +01:00
committed by Damjan Marion
parent 317cace618
commit 8973b07eec
36 changed files with 1673 additions and 1807 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/lacp/input.c
+7 -7
View File
@@ -16,7 +16,7 @@
#define _GNU_SOURCE
#include <vnet/bonding/node.h>
#include <lacp/node.h>
#include <vpp/stats/stat_segment.h>
#include <vlib/stats/stats.h>
static int
lacp_packet_scan (vlib_main_t * vm, member_if_t * mif)
@@ -213,12 +213,12 @@ lacp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
/* Actually scan the packet */
e = lacp_packet_scan (vm, mif);
bif = bond_get_bond_if_by_dev_instance (mif->bif_dev_instance);
stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
[mif->sw_if_index].actor_state,
mif->actor.state);
stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
[mif->sw_if_index].partner_state,
mif->partner.state);
vlib_stats_set_gauge (
bm->stats[bif->sw_if_index][mif->sw_if_index].actor_state,
mif->actor.state);
vlib_stats_set_gauge (
bm->stats[bif->sw_if_index][mif->sw_if_index].partner_state,
mif->partner.state);
mif->last_packet_signature_valid = 1;
mif->last_packet_signature = last_packet_signature;
}
src/plugins/lacp/lacp.c
+13 -13
View File
@@ -21,7 +21,7 @@
#include <vppinfra/hash.h>
#include <vnet/bonding/node.h>
#include <lacp/node.h>
#include <vpp/stats/stat_segment.h>
#include <vlib/stats/stats.h>
lacp_main_t lacp_main;
@@ -173,16 +173,16 @@ lacp_periodic (vlib_main_t * vm)
if (actor_state != mif->actor.state)
{
bif = bond_get_bond_if_by_dev_instance (mif->bif_dev_instance);
stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
[mif->sw_if_index].actor_state,
mif->actor.state);
vlib_stats_set_gauge (
bm->stats[bif->sw_if_index][mif->sw_if_index].actor_state,
mif->actor.state);
}
if (partner_state != mif->partner.state)
{
bif = bond_get_bond_if_by_dev_instance (mif->bif_dev_instance);
stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
[mif->sw_if_index].partner_state,
mif->partner.state);
vlib_stats_set_gauge (
bm->stats[bif->sw_if_index][mif->sw_if_index].partner_state,
mif->partner.state);
}
}
/* *INDENT-ON* */
@@ -380,12 +380,12 @@ lacp_init_state_machines (vlib_main_t * vm, member_if_t * mif)
lacp_init_mux_machine (vm, mif);
lacp_init_ptx_machine (vm, mif);
lacp_init_rx_machine (vm, mif);
stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
[mif->sw_if_index].actor_state,
mif->actor.state);
stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
[mif->sw_if_index].partner_state,
mif->partner.state);
vlib_stats_set_gauge (
bm->stats[bif->sw_if_index][mif->sw_if_index].actor_state,
mif->actor.state);
vlib_stats_set_gauge (
bm->stats[bif->sw_if_index][mif->sw_if_index].partner_state,
mif->partner.state);
}
VLIB_INIT_FUNCTION (lacp_periodic_init);