X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fcounter.c;h=8573b794fd9527f9c174c6c1c00a7f0c16d47a4b;hb=101fc278c3b7009c42574a25b96c4fb7fcd15e39;hp=5c3350fceecbf67d4eb81262b5edf5fe75b45172;hpb=58492a83722caf1c49977d73abf931418ce1f8f2;p=vpp.git diff --git a/src/vlib/counter.c b/src/vlib/counter.c index 5c3350fceec..8573b794fd9 100644 --- a/src/vlib/counter.c +++ b/src/vlib/counter.c @@ -38,6 +38,7 @@ */ #include +#include void vlib_clear_simple_counters (vlib_simple_counter_main_t * cm) @@ -74,31 +75,18 @@ vlib_clear_combined_counters (vlib_combined_counter_main_t * cm) } } -void *vlib_stats_push_heap (void) __attribute__ ((weak)); -void * -vlib_stats_push_heap (void) -{ - return 0; -}; - -void vlib_stats_pop_heap (void *, void *, int) __attribute__ ((weak)); -void -vlib_stats_pop_heap (void *notused, void *notused2, int type) -{ -}; - void vlib_validate_simple_counter (vlib_simple_counter_main_t * cm, u32 index) { vlib_thread_main_t *tm = vlib_get_thread_main (); int i; - void *oldheap = vlib_stats_push_heap (); + void *oldheap = vlib_stats_push_heap (cm->counters); vec_validate (cm->counters, tm->n_vlib_mains - 1); for (i = 0; i < tm->n_vlib_mains; i++) vec_validate_aligned (cm->counters[i], index, CLIB_CACHE_LINE_BYTES); - vlib_stats_pop_heap (cm, oldheap, + vlib_stats_pop_heap (cm, oldheap, index, 2 /* STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE */ ); } @@ -107,13 +95,13 @@ vlib_validate_combined_counter (vlib_combined_counter_main_t * cm, u32 index) { vlib_thread_main_t *tm = vlib_get_thread_main (); int i; - void *oldheap = vlib_stats_push_heap (); + void *oldheap = vlib_stats_push_heap (cm->counters); vec_validate (cm->counters, tm->n_vlib_mains - 1); for (i = 0; i < tm->n_vlib_mains; i++) vec_validate_aligned (cm->counters[i], index, CLIB_CACHE_LINE_BYTES); - vlib_stats_pop_heap (cm, oldheap, + vlib_stats_pop_heap (cm, oldheap, index, 3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ ); } @@ -131,30 +119,6 @@ vlib_simple_counter_n_counters (const vlib_simple_counter_main_t * cm) return (vec_len (cm->counters[0])); } -void -serialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va) -{ - clib_warning ("unimplemented"); -} - -void -unserialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va) -{ - clib_warning ("unimplemented"); -} - -void -serialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va) -{ - clib_warning ("unimplemented"); -} - -void -unserialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va) -{ - clib_warning ("unimplemented"); -} - /* * fd.io coding-style-patch-verification: ON *