X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fcounter.c;h=8573b794fd9527f9c174c6c1c00a7f0c16d47a4b;hb=ce21599c8af34a3f9da813a3c953a38a16316b4d;hp=6afa73e0a7df7f233a1c03c4f4801a8a525d2c78;hpb=2fee16787ed0d622631223567635a77e14c8c076;p=vpp.git

diff --git a/src/vlib/counter.c b/src/vlib/counter.c
index 6afa73e0a7d..8573b794fd9 100644
--- a/src/vlib/counter.c
+++ b/src/vlib/counter.c
@@ -38,6 +38,7 @@
  */
 
 #include <vlib/vlib.h>
+#include <vlib/stat_weak_inlines.h>
 
 void
 vlib_clear_simple_counters (vlib_simple_counter_main_t * cm)
@@ -74,32 +75,19 @@ 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,
-		       3 /* STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE */ );
+  vlib_stats_pop_heap (cm, oldheap, index,
+		       2 /* STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE */ );
 }
 
 void
@@ -107,14 +95,14 @@ 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,
-		       4 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
+  vlib_stats_pop_heap (cm, oldheap, index,
+		       3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
 }
 
 u32
@@ -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
  *