Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: Table Replace
[vpp.git]
/
src
/
vnet
/
fib
/
ip4_fib.c
diff --git
a/src/vnet/fib/ip4_fib.c
b/src/vnet/fib/ip4_fib.c
index
57fc23b
..
02348af
100644
(file)
--- a/
src/vnet/fib/ip4_fib.c
+++ b/
src/vnet/fib/ip4_fib.c
@@
-18,7
+18,7
@@
#include <vnet/fib/ip4_fib.h>
/*
#include <vnet/fib/ip4_fib.h>
/*
- * A table of pefixes to be added to tables and the sources for them
+ * A table of p
r
efixes to be added to tables and the sources for them
*/
typedef struct ip4_fib_table_special_prefix_t_ {
fib_prefix_t ift_prefix;
*/
typedef struct ip4_fib_table_special_prefix_t_ {
fib_prefix_t ift_prefix;
@@
-435,7
+435,7
@@
ip4_fib_table_sub_tree_walk (ip4_fib_t *fib,
int i;
/*
int i;
/*
- * There is no efficent way to walk this array of hash tables.
+ * There is no effic
i
ent way to walk this array of hash tables.
* so we walk each table with a mask length greater than and equal to
* the required root and check it is covered by the root.
*/
* so we walk each table with a mask length greater than and equal to
* the required root and check it is covered by the root.
*/
@@
-566,12
+566,12
@@
u8 *
format_ip4_fib_table_memory (u8 * s, va_list * args)
{
#if USE_DLMALLOC == 0
format_ip4_fib_table_memory (u8 * s, va_list * args)
{
#if USE_DLMALLOC == 0
- s = format(s, "%=30s %=6d %=
8
ld\n",
+ s = format(s, "%=30s %=6d %=
12
ld\n",
"IPv4 unicast",
pool_elts(ip4_main.fibs),
mheap_bytes(ip4_main.mtrie_mheap));
#else
"IPv4 unicast",
pool_elts(ip4_main.fibs),
mheap_bytes(ip4_main.mtrie_mheap));
#else
- s = format(s, "%=30s %=6d %=
8
ld\n",
+ s = format(s, "%=30s %=6d %=
12
ld\n",
"IPv4 unicast",
pool_elts(ip4_main.fibs),
mspace_footprint(ip4_main.mtrie_mheap));
"IPv4 unicast",
pool_elts(ip4_main.fibs),
mspace_footprint(ip4_main.mtrie_mheap));
@@
-671,12
+671,14
@@
ip4_show_fib (vlib_main_t * vm,
continue;
}
continue;
}
- s = format(s, "%U, fib_index:%d, flow hash:[%U] locks:[",
+ s = format(s, "%U, fib_index:%d, flow hash:[%U]
epoch:%d flags:%U
locks:[",
format_fib_table_name, fib->index,
FIB_PROTOCOL_IP4,
fib->index,
format_ip_flow_hash_config,
format_fib_table_name, fib->index,
FIB_PROTOCOL_IP4,
fib->index,
format_ip_flow_hash_config,
- fib_table->ft_flow_hash_config);
+ fib_table->ft_flow_hash_config,
+ fib_table->ft_epoch,
+ format_fib_table_flags, fib_table->ft_flags);
FOR_EACH_FIB_SOURCE(source)
{
if (0 != fib_table->ft_locks[source])
FOR_EACH_FIB_SOURCE(source)
{
if (0 != fib_table->ft_locks[source])