X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Ferror.h;h=2bffc6b9367ec7adaf1a251a0ae57b29bb9c4a80;hb=06111a837;hp=58352519be2c32cbd3557cd651ad077d530fd1e8;hpb=aa682a39b76ee043f65313f23e134bf18fe7a47e;p=vpp.git

diff --git a/src/vlib/error.h b/src/vlib/error.h
index 58352519be2..2bffc6b9367 100644
--- a/src/vlib/error.h
+++ b/src/vlib/error.h
@@ -40,37 +40,23 @@
 #ifndef included_vlib_error_h
 #define included_vlib_error_h
 
-/* Combined 16 bit node & 16 bit code as 32 bit number. */
-typedef u16 vlib_error_t;
-
-always_inline u32
-vlib_error_get_node (vlib_error_t e)
-{
-  return e >> 6;
-}
+#include <vppinfra/format.h>
 
-always_inline u32
-vlib_error_get_code (vlib_error_t e)
-{
-  return e & 0x3f;
-}
+typedef u16 vlib_error_t;
 
-always_inline vlib_error_t
-vlib_error_set (u32 node_index, u32 code)
+enum vl_counter_severity_e
 {
-  ASSERT (node_index < (1 << 10));
-  ASSERT (code < (1 << 6));
-  return (node_index << 6) | code;
-}
+  VL_COUNTER_SEVERITY_ERROR,
+  VL_COUNTER_SEVERITY_WARN,
+  VL_COUNTER_SEVERITY_INFO,
+};
 
-always_inline vlib_error_t
-vlib_error_set_code (vlib_error_t e, u32 code)
+typedef struct
 {
-  ASSERT (vlib_error_get_code (e) == 0);
-  ASSERT (code < (1 << 6));
-  e |= code;
-  return e;
-}
+  char *name;
+  char *desc;
+  enum vl_counter_severity_e severity;
+} vl_counter_t;
 
 typedef struct
 {
@@ -80,15 +66,18 @@ typedef struct
   /* Counter values as of last counter clear. */
   u64 *counters_last_clear;
 
-  /* Error name strings in heap.  Heap index
+  /* Counter structures in heap. Heap index
      indexes counter vector. */
-  char **error_strings_heap;
+  vl_counter_t *counters_heap;
 } vlib_error_main_t;
 
 /* Per node error registration. */
 void vlib_register_errors (struct vlib_main_t *vm,
 			   u32 node_index,
-			   u32 n_errors, char *error_strings[]);
+			   u32 n_errors, char *error_strings[],
+			   vl_counter_t counters[]);
+
+unformat_function_t unformat_vlib_error;
 
 #endif /* included_vlib_error_h */