stats: memory leak in stat_validate_counter_vector

[vpp.git] / src / vpp / stats / stat_segment.c

diff --git a/src/vpp/stats/stat_segment.c b/src/vpp/stats/stat_segment.c
index 0e3fa41..8727122 100644 (file)
--- a/src/vpp/stats/stat_segment.c
+++ b/src/vpp/stats/stat_segment.c
@@ -148,6 +148,44 @@ vlib_stats_delete_counter (u32 index, void *oldheap)
   e->type = STAT_DIR_TYPE_EMPTY;
 }
 
+/*
+ * Called from main heap
+ */
+void
+vlib_stats_delete_cm (void *cm_arg)
+{
+  vlib_simple_counter_main_t *cm = (vlib_simple_counter_main_t *) cm_arg;
+  stat_segment_main_t *sm = &stat_segment_main;
+  stat_segment_directory_entry_t *e;
+  stat_segment_shared_header_t *shared_header = sm->shared_header;
+
+  /* Not all counters have names / hash-table entries */
+  if (!cm->name && !cm->stat_segment_name)
+    {
+      return;
+    }
+  vlib_stat_segment_lock ();
+
+  /* Lookup hash-table is on the main heap */
+  char *stat_segment_name =
+    cm->stat_segment_name ? cm->stat_segment_name : cm->name;
+  u32 index = lookup_hash_index ((u8 *) stat_segment_name);
+
+  e = &sm->directory_vector[index];
+  hash_unset (sm->directory_vector_by_name, &e->name);
+
+  u64 *offset_vector = stat_segment_pointer (shared_header, e->offset_vector);
+
+  void *oldheap = clib_mem_set_heap (sm->heap);        /* Enter stats segment */
+  vec_free (offset_vector);
+  clib_mem_set_heap (oldheap); /* Exit stats segment */
+
+  memset (e, 0, sizeof (*e));
+  e->type = STAT_DIR_TYPE_EMPTY;
+
+  vlib_stat_segment_unlock ();
+}
+
 void
 vlib_stats_pop_heap (void *cm_arg, void *oldheap, u32 cindex,
                     stat_directory_type_t type)
@@ -172,6 +210,7 @@ vlib_stats_pop_heap (void *cm_arg, void *oldheap, u32 cindex,
   /* Lookup hash-table is on the main heap */
   stat_segment_name =
     cm->stat_segment_name ? cm->stat_segment_name : cm->name;
+
   clib_mem_set_heap (oldheap); /* Exit stats segment */
   u32 vector_index = lookup_hash_index ((u8 *) stat_segment_name);
   /* Back to stats segment */
@@ -256,20 +295,28 @@ stat_validate_counter_vector (stat_segment_directory_entry_t * ep, u32 max)
 {
   stat_segment_main_t *sm = &stat_segment_main;
   stat_segment_shared_header_t *shared_header = sm->shared_header;
-  counter_t **counters = 0;
+  counter_t **counters =
+    ep->offset ? stat_segment_pointer (shared_header, ep->offset) : 0;
   vlib_thread_main_t *tm = vlib_get_thread_main ();
   int i;
   u64 *offset_vector = 0;
 
   vec_validate_aligned (counters, tm->n_vlib_mains - 1,
                        CLIB_CACHE_LINE_BYTES);
+  ep->offset = stat_segment_offset (shared_header, counters);
+
   for (i = 0; i < tm->n_vlib_mains; i++)
     {
       vec_validate_aligned (counters[i], max, CLIB_CACHE_LINE_BYTES);
       vec_add1 (offset_vector,
                stat_segment_offset (shared_header, counters[i]));
     }
-  ep->offset = stat_segment_offset (shared_header, counters);
+
+  if (ep->offset_vector)
+    {
+      u64 *p = stat_segment_pointer (sm->shared_header, ep->offset_vector);
+      vec_free (p);
+    }
   ep->offset_vector = stat_segment_offset (shared_header, offset_vector);
 }