stats: revert enable/disable segments polls

[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 24ab3e6..c20ecfc 100644 (file)
--- a/src/vpp/stats/stat_segment.c
+++ b/src/vpp/stats/stat_segment.c
@@ -387,6 +387,7 @@ vlib_stats_pop_heap2 (u64 * error_vector, u32 thread_index, void *oldheap,
  * Create a new entry and add name to directory hash.
  * Returns ~0 if name exists.
  * Called from main heap.
+ * The name is either C-string or nul-terminated vector
  */
 u32
 stat_segment_new_entry (u8 *name, stat_directory_type_t t)
@@ -404,7 +405,7 @@ stat_segment_new_entry (u8 *name, stat_directory_type_t t)
 
   memset (&e, 0, sizeof (e));
   e.type = t;
-  memcpy (e.name, name, vec_len (name));
+  strcpy_s (e.name, sizeof (e.name), (char *) name);
 
   oldheap = vlib_stats_push_heap (NULL);
   vlib_stat_segment_lock ();
@@ -779,9 +780,9 @@ do_stat_segment_updates (vlib_main_t *vm, stat_segment_main_t *sm)
   /* *INDENT-OFF* */
   stat_segment_gauges_pool_t *g;
   pool_foreach (g, sm->gauges)
-   {
-    g->fn(&sm->directory_vector[g->directory_index], g->caller_index);
-  }
+    {
+      g->fn (&sm->directory_vector[g->directory_index], g->caller_index);
+    }
   /* *INDENT-ON* */
 
   /* Heartbeat, so clients detect we're still here */
@@ -899,7 +900,7 @@ stat_segment_poll_add (u32 vector_index, stat_segment_update_fn update_fn,
  * Deprecated, replace with stat_segment_new_entry + stat_segment_pool_add
  */
 clib_error_t *
-stat_segment_register_gauge (u8 * name, stat_segment_update_fn update_fn,
+stat_segment_register_gauge (u8 *name, stat_segment_update_fn update_fn,
                             u32 caller_index)
 {
   stat_segment_main_t *sm = &stat_segment_main;