X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fnode.h;h=fb2a83bc400c26a76cc3ffd750cbba69867aa302;hb=040950a59d53e8802ad31430d67df105939cce4c;hp=277cee89cafe21029b288808457e82288e0efcf5;hpb=6e36351faf5b69a0bfb8235b3b06f8b2c24e5547;p=vpp.git

diff --git a/src/vlib/node.h b/src/vlib/node.h
index 277cee89caf..fb2a83bc400 100644
--- a/src/vlib/node.h
+++ b/src/vlib/node.h
@@ -80,6 +80,7 @@ typedef struct _vlib_node_fn_registration
   vlib_node_function_t *function;
   int priority;
   struct _vlib_node_fn_registration *next_registration;
+  char *name;
 } vlib_node_fn_registration_t;
 
 typedef struct _vlib_node_registration
@@ -175,6 +176,14 @@ __VA_ARGS__ vlib_node_registration_t x
 static __clib_unused vlib_node_registration_t __clib_unused_##x
 #endif
 
+#ifndef CLIB_MARCH_VARIANT
+#define CLIB_MARCH_VARIANT_STR "default"
+#else
+#define _CLIB_MARCH_VARIANT_STR(s) __CLIB_MARCH_VARIANT_STR(s)
+#define __CLIB_MARCH_VARIANT_STR(s) #s
+#define CLIB_MARCH_VARIANT_STR _CLIB_MARCH_VARIANT_STR(CLIB_MARCH_VARIANT)
+#endif
+
 #define VLIB_NODE_FN(node)						\
 uword CLIB_MARCH_SFX (node##_fn)();					\
 static vlib_node_fn_registration_t					\
@@ -188,6 +197,7 @@ CLIB_MARCH_SFX (node##_multiarch_register) (void)			\
   vlib_node_fn_registration_t *r;					\
   r = & CLIB_MARCH_SFX (node##_fn_registration);			\
   r->priority = CLIB_MARCH_FN_PRIORITY();				\
+  r->name = CLIB_MARCH_VARIANT_STR;					\
   r->next_registration = node.node_fn_registrations;			\
   node.node_fn_registrations = r;					\
 }									\
@@ -234,6 +244,8 @@ typedef struct
   u64 calls, vectors, clocks, suspends;
   u64 max_clock;
   u64 max_clock_n;
+  u64 perf_counter_ticks;
+  u64 perf_counter_vectors;
 } vlib_node_stats_t;
 
 #define foreach_vlib_node_state					\
@@ -361,6 +373,9 @@ typedef struct vlib_node_t
 			 struct vlib_frame_t * f);
   /* for pretty-printing, not typically valid */
   u8 *state_string;
+
+  /* Node function candidate registration with priority */
+  vlib_node_fn_registration_t *node_fn_registrations;
 } vlib_node_t;
 
 #define VLIB_INVALID_NODE_INDEX ((u32) ~0)
@@ -373,6 +388,9 @@ typedef struct vlib_node_t
 typedef struct vlib_frame_t
 {
   /* Frame flags. */
+  u16 frame_flags;
+
+  /* User flags. Used for sending hints to the next node. */
   u16 flags;
 
   /* Number of scalar bytes in arguments. */
@@ -426,7 +444,7 @@ typedef struct
 always_inline void
 vlib_next_frame_init (vlib_next_frame_t * nf)
 {
-  memset (nf, 0, sizeof (nf[0]));
+  clib_memset (nf, 0, sizeof (nf[0]));
   nf->frame_index = ~0;
   nf->node_runtime_index = ~0;
 }
@@ -472,6 +490,9 @@ typedef struct vlib_node_runtime_t
   u32 vectors_since_last_overflow;	/**< Number of vector elements
 					  processed by this node. */
 
+  u32 perf_counter_ticks_since_last_overflow; /**< Perf counter ticks */
+  u32 perf_counter_vectors_since_last_overflow;	/**< Perf counter vectors */
+
   u32 next_frame_index;			/**< Start of next frames for this
 					  node. */