X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Ferror.c;h=0918f624a6628d573ba46d3b44bd07b6a68e379c;hb=dea0b23fa73fe3d53b8f3b004f7b8a2a8456d7f7;hp=aa53324fa8ff486be9163a5c8fdff6972812c630;hpb=2fee16787ed0d622631223567635a77e14c8c076;p=vpp.git

diff --git a/src/vlib/error.c b/src/vlib/error.c
index aa53324fa8f..0918f624a66 100644
--- a/src/vlib/error.c
+++ b/src/vlib/error.c
@@ -39,6 +39,7 @@
 
 #include <vlib/vlib.h>
 #include <vppinfra/heap.h>
+#include <vlib/stat_weak_inlines.h>
 
 uword
 vlib_error_drop_buffers (vlib_main_t * vm,
@@ -51,8 +52,10 @@ vlib_error_drop_buffers (vlib_main_t * vm,
 {
   u32 n_left_this_frame, n_buffers_left, *args, n_args_left;
   vlib_error_t drop_error;
+  vlib_node_t *n;
 
-  drop_error = vlib_error_set (drop_error_node, drop_error_code);
+  n = vlib_get_node (vm, drop_error_node);
+  drop_error = n->error_heap_index + drop_error_code;
 
   n_buffers_left = n_buffers;
   while (n_buffers_left > 0)
@@ -109,60 +112,17 @@ vlib_error_drop_buffers (vlib_main_t * vm,
   return n_buffers;
 }
 
-/* Convenience node to drop a vector of buffers with a "misc error". */
-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),
-				  /* buffer stride */ 1,
-				  frame->n_vectors,
-				  /* next */ 0,
-				  node->node_index,
-				  /* error */ 0);
-}
-
-static char *misc_drop_buffers_error_strings[] = {
-  [0] = "misc. errors",
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (misc_drop_buffers_node,static) = {
-  .function = misc_drop_buffers,
-  .name = "misc-drop-buffers",
-  .vector_size = sizeof (u32),
-  .n_errors = 1,
-  .n_next_nodes = 1,
-  .next_nodes = {
-      "error-drop",
-  },
-  .error_strings = misc_drop_buffers_error_strings,
-};
-/* *INDENT-ON* */
-
-void vlib_stats_register_error_index (u8 *, u64) __attribute__ ((weak));
-void
-vlib_stats_register_error_index (u8 * notused, u64 notused2)
-{
-};
-
-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,
 		      u32 node_index, u32 n_errors, char *error_strings[])
 {
   vlib_error_main_t *em = &vm->error_main;
+  vlib_node_main_t *nm = &vm->node_main;
+
   vlib_node_t *n = vlib_get_node (vm, node_index);
   uword l;
   void *oldheap;
-  void *vlib_stats_push_heap (void) __attribute__ ((weak));
 
   ASSERT (vlib_get_thread_index () == 0);
 
@@ -187,7 +147,7 @@ vlib_register_errors (vlib_main_t * vm,
   vec_validate (vm->error_elog_event_types, l - 1);
 
   /* Switch to the stats segment ... */
-  oldheap = vlib_stats_push_heap ();
+  oldheap = vlib_stats_push_heap (0);
 
   /* Allocate a counter/elog type for each error. */
   vec_validate (em->counters, l - 1);
@@ -198,35 +158,42 @@ 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;
+    u8 *error_name = 0;
 
     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, n->error_heap_index + i);
+	vec_reset_length (error_name);
+	error_name =
+	  format (error_name, "/err/%v/%s%c", n->name, error_strings[i], 0);
+	vlib_stats_register_error_index (oldheap, error_name, em->counters,
+					 n->error_heap_index + i);
       }
+
+    vec_free (error_name);
   }
 
   /* (re)register the em->counters base address, switch back to main heap */
-  vlib_stats_pop_heap2 (em->counters, vm->thread_index, oldheap);
+  vlib_stats_pop_heap2 (em->counters, vm->thread_index, oldheap, 1);
 
   {
     elog_event_type_t t;
     uword i;
 
-    memset (&t, 0, sizeof (t));
+    clib_memset (&t, 0, sizeof (t));
+    if (n_errors > 0)
+      vec_validate (nm->node_by_error, n->error_heap_index + n_errors - 1);
     for (i = 0; i < n_errors; i++)
       {
 	t.format = (char *) format (0, "%v %s: %%d",
 				    n->name, error_strings[i]);
 	vm->error_elog_event_types[n->error_heap_index + i] = t;
+	nm->node_by_error[n->error_heap_index + i] = n->index;
       }
   }
 }