X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Ferror.c;h=691e6396d971db64d7241919063ab7be8cc004f9;hb=b4d3053;hp=a2c2317686bad6b357865fbcb4f29942beaa4d9d;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vlib/error.c b/src/vlib/error.c
index a2c2317686b..691e6396d97 100644
--- a/src/vlib/error.c
+++ b/src/vlib/error.c
@@ -114,7 +114,7 @@ static uword
 misc_drop_buffers (vlib_main_t * vm,
 		   vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
-  return vlib_error_drop_buffers (vm, node, vlib_frame_args (frame),
+  return vlib_error_drop_buffers (vm, node, vlib_frame_vector_args (frame),
 				  /* buffer stride */ 1,
 				  frame->n_vectors,
 				  /* next */ 0,
@@ -140,6 +140,20 @@ VLIB_REGISTER_NODE (misc_drop_buffers_node,static) = {
 };
 /* *INDENT-ON* */
 
+void vlib_stats_register_error_index (u8 *, u64 *, u64)
+  __attribute__ ((weak));
+void
+vlib_stats_register_error_index (u8 * notused, u64 * notused2, u64 notused3)
+{
+};
+
+void vlib_stats_pop_heap2 (void *, u32, void *) __attribute__ ((weak));
+void
+vlib_stats_pop_heap2 (void *notused, u32 notused2, void *notused3)
+{
+};
+
+
 /* Reserves given number of error codes for given node. */
 void
 vlib_register_errors (vlib_main_t * vm,
@@ -148,8 +162,10 @@ vlib_register_errors (vlib_main_t * vm,
   vlib_error_main_t *em = &vm->error_main;
   vlib_node_t *n = vlib_get_node (vm, node_index);
   uword l;
+  void *oldheap;
+  void *vlib_stats_push_heap (void) __attribute__ ((weak));
 
-  ASSERT (os_get_cpu_number () == 0);
+  ASSERT (vlib_get_thread_index () == 0);
 
   /* Free up any previous error strings. */
   if (n->n_errors > 0)
@@ -169,9 +185,13 @@ vlib_register_errors (vlib_main_t * vm,
   clib_memcpy (vec_elt_at_index (em->error_strings_heap, n->error_heap_index),
 	       error_strings, n_errors * sizeof (error_strings[0]));
 
+  vec_validate (vm->error_elog_event_types, l - 1);
+
+  /* Switch to the stats segment ... */
+  oldheap = vlib_stats_push_heap ();
+
   /* Allocate a counter/elog type for each error. */
   vec_validate (em->counters, l - 1);
-  vec_validate (vm->error_elog_event_types, l - 1);
 
   /* Zero counters for re-registrations of errors. */
   if (n->error_heap_index + n_errors <= vec_len (em->counters_last_clear))
@@ -179,14 +199,31 @@ vlib_register_errors (vlib_main_t * vm,
 		 em->counters_last_clear + n->error_heap_index,
 		 n_errors * sizeof (em->counters[0]));
   else
-    memset (em->counters + n->error_heap_index,
-	    0, n_errors * sizeof (em->counters[0]));
+    clib_memset (em->counters + n->error_heap_index,
+		 0, n_errors * sizeof (em->counters[0]));
+
+  /* Register counter indices in the stat segment directory */
+  {
+    int i;
+    u8 *error_name;
+
+    for (i = 0; i < n_errors; i++)
+      {
+	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,
+					 n->error_heap_index + i);
+      }
+  }
+
+  /* (re)register the em->counters base address, switch back to main heap */
+  vlib_stats_pop_heap2 (em->counters, vm->thread_index, oldheap);
 
   {
     elog_event_type_t t;
     uword i;
 
-    memset (&t, 0, sizeof (t));
+    clib_memset (&t, 0, sizeof (t));
     for (i = 0; i < n_errors; i++)
       {
 	t.format = (char *) format (0, "%v %s: %%d",
@@ -280,7 +317,7 @@ show_errors (vlib_main_t * vm,
 }
 
 /* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_errors, static) = {
+VLIB_CLI_COMMAND (vlib_cli_show_errors) = {
   .path = "show errors",
   .short_help = "Show error counts",
   .function = show_errors,