stats: fix memory leakage when adding / deleting interfaces

This fixes two leaks in registering errors in the stats segment.
- The error name created by vlib_register_errors() was not freed.
- Duplicate error names (when interface readded) was added to the vector.

This fix also adds memory usage statistics for the statistics segment
as /mem/statseg/{used, total}

Change-Id: Ife98d5fc5baef5bdae426a5a1eef428af2b9ab8a
Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/vlib/error.c b/src/vlib/error.c
index 7c61f319fc0..ef506635ad9 100644
--- a/src/vlib/error.c
+++ b/src/vlib/error.c
@@ -166,7 +166,7 @@ vlib_register_errors (vlib_main_t * vm,
       {
 	error_name = format (0, "/err/%v/%s%c", n->name, error_strings[i], 0);
 	/* Note: error_name consumed by the following call */
-	vlib_stats_register_error_index (error_name, em->counters,
+	vlib_stats_register_error_index (oldheap, error_name, em->counters,
 					 n->error_heap_index + i);
       }
   }
diff --git a/src/vlib/stat_weak_inlines.h b/src/vlib/stat_weak_inlines.h
index 5c04610ef13..d288a04c477 100644
--- a/src/vlib/stat_weak_inlines.h
+++ b/src/vlib/stat_weak_inlines.h
@@ -32,10 +32,10 @@ void
 vlib_stats_pop_heap (void *notused, void *notused2, u32 i, int type)
 {
 };
-void vlib_stats_register_error_index (u8 *, u64 *, u64)
+void vlib_stats_register_error_index (void *, u8 *, u64 *, u64)
   __attribute__ ((weak));
 void
-vlib_stats_register_error_index (u8 * notused, u64 * notused2, u64 notused3)
+vlib_stats_register_error_index (void * notused, u8 * notused2, u64 * notused3, u64 notused4)
 {
 };