stats: refactor

[vpp.git] / src / vlib / counter.c

diff --git a/src/vlib/counter.c b/src/vlib/counter.c
index edba375..ceaf013 100644 (file)
--- a/src/vlib/counter.c
+++ b/src/vlib/counter.c
@@ -38,7 +38,7 @@
  */
 
 #include <vlib/vlib.h>
-#include <vlib/stat_weak_inlines.h>
+#include <vlib/stats/stats.h>
 
 void
 vlib_clear_simple_counters (vlib_simple_counter_main_t * cm)
@@ -79,15 +79,24 @@ 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 (cm->counters);
+  int i, resized = 0;
+  void *oldheap = vlib_stats_set_heap ();
 
   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);
+    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);
+      }
 
-  vlib_stats_pop_heap (cm, oldheap, index,
-                      2 /* STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE */ );
+  clib_mem_set_heap (oldheap);
+  /* Avoid the epoch increase when there was no counter vector resize. */
+  if (resized)
+    vlib_stats_update_counter (cm, index, STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE);
 }
 
 void
@@ -97,7 +106,7 @@ vlib_free_simple_counter (vlib_simple_counter_main_t * cm)
 
   vlib_stats_delete_cm (cm);
 
-  void *oldheap = vlib_stats_push_heap (cm->counters);
+  void *oldheap = vlib_stats_set_heap ();
   for (i = 0; i < vec_len (cm->counters); i++)
     vec_free (cm->counters[i]);
   vec_free (cm->counters);
@@ -108,15 +117,57 @@ void
 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 (cm->counters);
+  int i, resized = 0;
+  void *oldheap = vlib_stats_set_heap ();
 
   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);
+    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);
+      }
+
+  clib_mem_set_heap (oldheap);
+  /* Avoid the epoch increase when there was no counter vector resize. */
+  if (resized)
+    vlib_stats_update_counter (cm, index,
+                              STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED);
+}
+
+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_set_heap ();
 
-  vlib_stats_pop_heap (cm, oldheap, index,
-                      3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
+  /* 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++)
+    {
+      /* 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
@@ -126,7 +177,7 @@ vlib_free_combined_counter (vlib_combined_counter_main_t * cm)
 
   vlib_stats_delete_cm (cm);
 
-  void *oldheap = vlib_stats_push_heap (cm->counters);
+  void *oldheap = vlib_stats_set_heap ();
   for (i = 0; i < vec_len (cm->counters); i++)
     vec_free (cm->counters[i]);
   vec_free (cm->counters);