Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Harmonize vec/pool_get_aligned object sizes and alignment requests
[vpp.git]
/
src
/
vnet
/
fib
/
mpls_fib.c
diff --git
a/src/vnet/fib/mpls_fib.c
b/src/vnet/fib/mpls_fib.c
index
4eeef7a
..
223a0dd
100644
(file)
--- a/
src/vnet/fib/mpls_fib.c
+++ b/
src/vnet/fib/mpls_fib.c
@@
-92,7
+92,7
@@
mpls_fib_create_with_table_id (u32 table_id,
mpls_fib_t *mf;
int i;
mpls_fib_t *mf;
int i;
- pool_get
_aligned(mpls_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES
);
+ pool_get
(mpls_main.fibs, fib_table
);
pool_get_aligned(mpls_main.mpls_fibs, mf, CLIB_CACHE_LINE_BYTES);
ASSERT((fib_table - mpls_main.fibs) ==
pool_get_aligned(mpls_main.mpls_fibs, mf, CLIB_CACHE_LINE_BYTES);
ASSERT((fib_table - mpls_main.fibs) ==
@@
-359,6
+359,18
@@
mpls_fib_table_walk (mpls_fib_t *mpls_fib,
}));
}
}));
}
+u8 *
+format_mpls_fib_table_memory (u8 * s, va_list * args)
+{
+ u64 n_tables, mem;
+
+ n_tables = pool_elts(mpls_main.fibs);
+ mem = n_tables * sizeof(mpls_fib_t);
+ s = format(s, "%=30s %=6ld %=8ld\n", "MPLS", n_tables, mem);
+
+ return (s);
+}
+
static void
mpls_fib_table_show_all (const mpls_fib_t *mpls_fib,
vlib_main_t * vm)
static void
mpls_fib_table_show_all (const mpls_fib_t *mpls_fib,
vlib_main_t * vm)