dpdk: fix extended stat strings

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

diff --git a/src/vlib/counter.c b/src/vlib/counter.c
index 9f66e04..adf667f 100644 (file)
--- a/src/vlib/counter.c
+++ b/src/vlib/counter.c
@@ -38,60 +38,41 @@
  */
 
 #include <vlib/vlib.h>
+#include <vlib/stat_weak_inlines.h>
 
 void
 vlib_clear_simple_counters (vlib_simple_counter_main_t * cm)
 {
+  counter_t *my_counters;
   uword i, j;
-  u16 *my_minis;
 
-  for (i = 0; i < vec_len (cm->minis); i++)
+  for (i = 0; i < vec_len (cm->counters); i++)
     {
-      my_minis = cm->minis[i];
+      my_counters = cm->counters[i];
 
-      for (j = 0; j < vec_len (my_minis); j++)
+      for (j = 0; j < vec_len (my_counters); j++)
        {
-         cm->maxi[j] += my_minis[j];
-         my_minis[j] = 0;
+         my_counters[j] = 0;
        }
     }
-
-  j = vec_len (cm->maxi);
-  if (j > 0)
-    vec_validate (cm->value_at_last_clear, j - 1);
-  for (i = 0; i < j; i++)
-    cm->value_at_last_clear[i] = cm->maxi[i];
 }
 
 void
 vlib_clear_combined_counters (vlib_combined_counter_main_t * cm)
 {
+  vlib_counter_t *my_counters;
   uword i, j;
-  vlib_mini_counter_t *my_minis;
 
-  for (i = 0; i < vec_len (cm->minis); i++)
+  for (i = 0; i < vec_len (cm->counters); i++)
     {
-      my_minis = cm->minis[i];
+      my_counters = cm->counters[i];
 
-      for (j = 0; j < vec_len (my_minis); j++)
+      for (j = 0; j < vec_len (my_counters); j++)
        {
-         cm->maxi[j].packets += my_minis[j].packets;
-         cm->maxi[j].bytes += my_minis[j].bytes;
-         my_minis[j].packets = 0;
-         my_minis[j].bytes = 0;
+         my_counters[j].packets = 0;
+         my_counters[j].bytes = 0;
        }
     }
-
-  j = vec_len (cm->maxi);
-  if (j > 0)
-    vec_validate (cm->value_at_last_clear, j - 1);
-
-  for (i = 0; i < j; i++)
-    {
-      vlib_counter_t *c = vec_elt_at_index (cm->value_at_last_clear, i);
-
-      c[0] = cm->maxi[i];
-    }
 }
 
 void
@@ -99,11 +80,28 @@ 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);
 
-  vec_validate (cm->minis, tm->n_vlib_mains - 1);
+  vec_validate (cm->counters, tm->n_vlib_mains - 1);
   for (i = 0; i < tm->n_vlib_mains; i++)
-    vec_validate_aligned (cm->minis[i], index, CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (cm->maxi, index, CLIB_CACHE_LINE_BYTES);
+    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 */ );
+}
+
+void
+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
@@ -111,35 +109,80 @@ 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);
 
-  vec_validate (cm->minis, tm->n_vlib_mains - 1);
+  vec_validate (cm->counters, tm->n_vlib_mains - 1);
   for (i = 0; i < tm->n_vlib_mains; i++)
-    vec_validate_aligned (cm->minis[i], index, CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (cm->maxi, index, CLIB_CACHE_LINE_BYTES);
+    vec_validate_aligned (cm->counters[i], index, CLIB_CACHE_LINE_BYTES);
+
+  vlib_stats_pop_heap (cm, oldheap, index,
+                      3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
 }
 
-void
-serialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va)
+int
+  vlib_validate_combined_counter_will_expand
+  (vlib_combined_counter_main_t * cm, u32 index)
 {
-  clib_warning ("unimplemented");
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  int i;
+  void *oldheap = vlib_stats_push_heap (cm->counters);
+
+  /* Possibly once in recorded history */
+  if (PREDICT_FALSE (vec_len (cm->counters) == 0))
+    {
+      vlib_stats_pop_heap (cm, oldheap, index,
+                          3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
+      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]) /* length_increment */ ,
+          sizeof (cm->counters[i]) /* data_bytes */ ,
+          0 /* header_bytes */ ,
+          CLIB_CACHE_LINE_BYTES /* data_alignment */ ))
+       {
+         vlib_stats_pop_heap (cm, oldheap, index,
+                              3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
+         return 1;
+       }
+    }
+  vlib_stats_pop_heap (cm, oldheap, index,
+                      3 /*STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED */ );
+  return 0;
 }
 
 void
-unserialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va)
+vlib_free_combined_counter (vlib_combined_counter_main_t * cm)
 {
-  clib_warning ("unimplemented");
+  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
-serialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va)
+u32
+vlib_combined_counter_n_counters (const vlib_combined_counter_main_t * cm)
 {
-  clib_warning ("unimplemented");
+  ASSERT (cm->counters);
+  return (vec_len (cm->counters[0]));
 }
 
-void
-unserialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va)
+u32
+vlib_simple_counter_n_counters (const vlib_simple_counter_main_t * cm)
 {
-  clib_warning ("unimplemented");
+  ASSERT (cm->counters);
+  return (vec_len (cm->counters[0]));
 }
 
 /*