X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fnode_funcs.h;h=577e013c7617338729a134e6a522a5ed79af2443;hb=refs%2Fchanges%2F56%2F13356%2F20;hp=547f09b7355a8d9a371ac25499270861dcd0971a;hpb=1403fcd7ec2da72334f5df20f0b7e6dbba24d856;p=vpp.git diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h index 547f09b7355..577e013c761 100644 --- a/src/vlib/node_funcs.h +++ b/src/vlib/node_funcs.h @@ -216,7 +216,7 @@ always_inline vlib_frame_t * vlib_get_frame_no_check (vlib_main_t * vm, uword frame_index) { vlib_frame_t *f; - f = vm->heap_base + (frame_index * VLIB_FRAME_ALIGN); + f = vm->heap_aligned_base + (frame_index * VLIB_FRAME_ALIGN); return f; } @@ -227,7 +227,7 @@ vlib_frame_index_no_check (vlib_main_t * vm, vlib_frame_t * f) ASSERT (((uword) f & (VLIB_FRAME_ALIGN - 1)) == 0); - i = ((u8 *) f - (u8 *) vm->heap_base); + i = ((u8 *) f - (u8 *) vm->heap_aligned_base); ASSERT ((i / VLIB_FRAME_ALIGN) <= 0xFFFFFFFFULL); return i / VLIB_FRAME_ALIGN; @@ -1127,8 +1127,10 @@ vlib_node_add_named_next (vlib_main_t * vm, uword node, char *name) /** * Get list of nodes */ -vlib_node_t ***vlib_node_get_nodes (vlib_main_t * vm, u32 max_threads, - int include_stats); +void +vlib_node_get_nodes (vlib_main_t * vm, u32 max_threads, int include_stats, + int barrier_sync, vlib_node_t **** node_dupsp, + vlib_main_t *** stat_vmsp); /* Query node given name. */ vlib_node_t *vlib_get_node_by_name (vlib_main_t * vm, u8 * name);