X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fcounter.c;h=186b48d869e736bb39e668e22d19f9343ec65027;hb=c7cceeebb738b0fabd93d2c4fdfd561321a2be1d;hp=5b73d5fa21ae67f0ceaeb1a6b6e9a34959a9b0b4;hpb=fe269f3c6f350444a17e4829311ac64dd0175641;p=vpp.git

diff --git a/src/vlib/counter.c b/src/vlib/counter.c
index 5b73d5fa21a..186b48d869e 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,47 +75,116 @@ vlib_clear_combined_counters (vlib_combined_counter_main_t * cm)
     }
 }
 
-void *vlib_stats_push_heap (void *) __attribute__ ((weak));
-void *
-vlib_stats_push_heap (void *unused)
+void
+vlib_validate_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
 {
-  return 0;
-};
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  int i, resized = 0;
+  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++)
+    if (index >= vec_len (cm->counters[i]))
+      {
+	if (vec_resize_will_expand (cm->counters[i],
+				    index - vec_len (cm->counters[i]) +
+				      1 /* length_increment */))
+	  resized++;
+	vec_validate_aligned (cm->counters[i], index, CLIB_CACHE_LINE_BYTES);
+      }
+
+  /* Avoid the epoch increase when there was no counter vector resize. */
+  if (resized)
+    vlib_stats_pop_heap (cm, oldheap, index,
+			 2 /* STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE */);
+  else
+    clib_mem_set_heap (oldheap);
+}
 
-void vlib_stats_pop_heap (void *, void *, u32, int) __attribute__ ((weak));
 void
-vlib_stats_pop_heap (void *notused, void *notused2, u32 i, int type)
+vlib_free_simple_counter (vlib_simple_counter_main_t * cm)
 {
-};
+  int i;
+
+  vlib_stats_delete_cm (cm);
+
+  void *oldheap = vlib_stats_push_heap (cm->counters);
+  for (i = 0; i < vec_len (cm->counters); i++)
+    vec_free (cm->counters[i]);
+  vec_free (cm->counters);
+  clib_mem_set_heap (oldheap);
+}
 
 void
-vlib_validate_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
+vlib_validate_combined_counter (vlib_combined_counter_main_t * cm, u32 index)
 {
   vlib_thread_main_t *tm = vlib_get_thread_main ();
-  int i;
+  int i, resized = 0;
   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, index,
-		       2 /* STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE */ );
+    if (index >= vec_len (cm->counters[i]))
+      {
+	if (vec_resize_will_expand (cm->counters[i],
+				    index - vec_len (cm->counters[i]) +
+				      1 /* length_increment */))
+	  resized++;
+	vec_validate_aligned (cm->counters[i], index, CLIB_CACHE_LINE_BYTES);
+      }
+
+  /* Avoid the epoch increase when there was no counter vector resize. */
+  if (resized)
+    vlib_stats_pop_heap (cm, oldheap, index,
+			 3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */);
+  else
+    clib_mem_set_heap (oldheap);
 }
 
-void
-vlib_validate_combined_counter (vlib_combined_counter_main_t * cm, u32 index)
+int
+  vlib_validate_combined_counter_will_expand
+  (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 (cm->counters);
 
-  vec_validate (cm->counters, tm->n_vlib_mains - 1);
+  /* Possibly once in recorded history */
+  if (PREDICT_FALSE (vec_len (cm->counters) == 0))
+    {
+      clib_mem_set_heap (oldheap);
+      return 1;
+    }
+
   for (i = 0; i < tm->n_vlib_mains; i++)
-    vec_validate_aligned (cm->counters[i], index, CLIB_CACHE_LINE_BYTES);
+    {
+      /* Trivially OK, and proves that index >= vec_len(...) */
+      if (index < vec_len (cm->counters[i]))
+	continue;
+      if (vec_resize_will_expand (cm->counters[i],
+				  index - vec_len (cm->counters[i]) +
+				    1 /* length_increment */))
+	{
+	  clib_mem_set_heap (oldheap);
+	  return 1;
+	}
+    }
+  clib_mem_set_heap (oldheap);
+  return 0;
+}
+
+void
+vlib_free_combined_counter (vlib_combined_counter_main_t * cm)
+{
+  int i;
+
+  vlib_stats_delete_cm (cm);
 
-  vlib_stats_pop_heap (cm, oldheap, index,
-		       3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
+  void *oldheap = vlib_stats_push_heap (cm->counters);
+  for (i = 0; i < vec_len (cm->counters); i++)
+    vec_free (cm->counters[i]);
+  vec_free (cm->counters);
+  clib_mem_set_heap (oldheap);
 }
 
 u32
@@ -131,30 +201,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
  *