Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MTRIE Optimisations 2
[vpp.git]
/
src
/
vpp
/
stats
/
stats.c
diff --git
a/src/vpp/stats/stats.c
b/src/vpp/stats/stats.c
index
1927da0
..
042d02e
100644
(file)
--- a/
src/vpp/stats/stats.c
+++ b/
src/vpp/stats/stats.c
@@
-17,6
+17,7
@@
#include <vlib/threads.h>
#include <vnet/fib/fib_entry.h>
#include <vnet/fib/fib_table.h>
#include <vlib/threads.h>
#include <vnet/fib/fib_entry.h>
#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip4_fib.h>
#include <vnet/dpo/load_balance.h>
#define STATS_DEBUG 0
#include <vnet/dpo/load_balance.h>
#define STATS_DEBUG 0
@@
-576,6
+577,7
@@
do_ip4_fibs (stats_main_t * sm)
static ip4_route_t *routes;
ip4_route_t *r;
fib_table_t *fib;
static ip4_route_t *routes;
ip4_route_t *r;
fib_table_t *fib;
+ ip4_fib_t *v4_fib;
ip_lookup_main_t *lm = &im4->lookup_main;
static uword *results;
vl_api_vnet_ip4_fib_counters_t *mp = 0;
ip_lookup_main_t *lm = &im4->lookup_main;
static uword *results;
vl_api_vnet_ip4_fib_counters_t *mp = 0;
@@
-592,6
+594,8
@@
again:
while ((fib - im4->fibs) < start_at_fib_index)
continue;
while ((fib - im4->fibs) < start_at_fib_index)
continue;
+ v4_fib = pool_elt_at_index (im4->v4_fibs, fib->ft_index);
+
if (mp == 0)
{
items_this_message = IP4_FIB_COUNTER_BATCH_SIZE;
if (mp == 0)
{
items_this_message = IP4_FIB_COUNTER_BATCH_SIZE;
@@
-615,9
+619,9
@@
again:
vec_reset_length (routes);
vec_reset_length (results);
vec_reset_length (routes);
vec_reset_length (results);
- for (i = 0; i < ARRAY_LEN (
fib->v4.
fib_entry_by_dst_address); i++)
+ for (i = 0; i < ARRAY_LEN (
v4_fib->
fib_entry_by_dst_address); i++)
{
{
- uword *hash =
fib->v4.
fib_entry_by_dst_address[i];
+ uword *hash =
v4_fib->
fib_entry_by_dst_address[i];
hash_pair_t *p;
ip4_route_t x;
hash_pair_t *p;
ip4_route_t x;