aboutsummaryrefslogtreecommitdiffstats
path: root/src/vpp/stats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-03-15 15:41:17 -0400
committerDamjan Marion <dmarion.lists@gmail.com>2017-03-17 19:45:36 +0000
commit1bd01099a6512b6119bbf337b36222a6f0770d49 (patch)
treee45152f3d42046869808e047cfb8dcbb1b541192 /src/vpp/stats
parent180279b912827c30494ec1b90ee4325a15cb337c (diff)
64 bit per-thread counters
after: TenGigabitEthernet5/0/1-output active 107522 17375708 0 7.22e0 161.60 TenGigabitEthernet5/0/1-tx active 107522 17375708 0 6.93e1 161.60 ip4-input-no-checksum active 107522 17375708 0 2.52e1 161.60 ip4-lookup active 107522 17375708 0 3.10e1 161.60 ip4-rewrite active 107522 17375708 0 2.52e1 161.60 before TenGigabitEthernet5/0/1-output active 433575 110995200 0 6.95e0 256.00 TenGigabitEthernet5/0/1-tx active 433575 110995200 0 7.14e1 256.00 ip4-input-no-checksum active 433575 110995200 0 2.66e1 256.00 ip4-lookup active 433575 110995200 0 3.29e1 256.00 ip4-rewrite active 433575 110995200 0 2.59e1 256.00 Change-Id: I46405bd22189f48a39f06e3443bb7e13f410b539 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vpp/stats')
-rw-r--r--src/vpp/stats/stats.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/vpp/stats/stats.c b/src/vpp/stats/stats.c
index c46d441a..1927da0b 100644
--- a/src/vpp/stats/stats.c
+++ b/src/vpp/stats/stats.c
@@ -134,7 +134,7 @@ do_simple_interface_counters (stats_main_t * sm)
vlib_simple_counter_main_t *cm;
u32 items_this_message = 0;
u64 v, *vp = 0;
- int i;
+ int i, n_counts;
/*
* Prevent interface registration from expanding / moving the vectors...
@@ -144,13 +144,13 @@ do_simple_interface_counters (stats_main_t * sm)
vec_foreach (cm, im->sw_if_counters)
{
-
- for (i = 0; i < vec_len (cm->maxi); i++)
+ n_counts = vlib_simple_counter_n_counters (cm);
+ for (i = 0; i < n_counts; i++)
{
if (mp == 0)
{
items_this_message = clib_min (SIMPLE_COUNTER_BATCH_SIZE,
- vec_len (cm->maxi) - i);
+ n_counts - i);
mp = vl_msg_api_alloc_as_if_client
(sizeof (*mp) + items_this_message * sizeof (v));
@@ -189,19 +189,19 @@ do_combined_interface_counters (stats_main_t * sm)
vlib_combined_counter_main_t *cm;
u32 items_this_message = 0;
vlib_counter_t v, *vp = 0;
- int i;
+ int i, n_counts;
vnet_interface_counter_lock (im);
vec_foreach (cm, im->combined_sw_if_counters)
{
-
- for (i = 0; i < vec_len (cm->maxi); i++)
+ n_counts = vlib_combined_counter_n_counters (cm);
+ for (i = 0; i < n_counts; i++)
{
if (mp == 0)
{
items_this_message = clib_min (COMBINED_COUNTER_BATCH_SIZE,
- vec_len (cm->maxi) - i);
+ n_counts - i);
mp = vl_msg_api_alloc_as_if_client
(sizeof (*mp) + items_this_message * sizeof (v));