X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fnode.h;h=6efb6f3e4fe68597bbc8706aae71d31b407a697d;hb=f5fa5ae2b021f946fbb8ec56e692459cd34bc7fb;hp=2acd61ce3f6a088efd6f1280dd3dc96c575e40b0;hpb=d84ba85c0071a28fe888c912c3dc37f471b0caeb;p=vpp.git

diff --git a/src/vlib/node.h b/src/vlib/node.h
index 2acd61ce3f6..6efb6f3e4fe 100644
--- a/src/vlib/node.h
+++ b/src/vlib/node.h
@@ -75,11 +75,22 @@ typedef enum
   VLIB_N_NODE_TYPE,
 } vlib_node_type_t;
 
+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
 {
   /* Vector processing function for this node. */
   vlib_node_function_t *function;
 
+  /* Node function candidate registration with priority */
+  vlib_node_fn_registration_t *node_fn_registrations;
+
   /* Node name. */
   char *name;
 
@@ -140,6 +151,7 @@ typedef struct _vlib_node_registration
 
 } vlib_node_registration_t;
 
+#ifndef CLIB_MARCH_VARIANT
 #define VLIB_REGISTER_NODE(x,...)                                       \
     __VA_ARGS__ vlib_node_registration_t x;                             \
 static void __vlib_add_node_registration_##x (void)                     \
@@ -150,7 +162,46 @@ static void __vlib_add_node_registration_##x (void)                     \
     x.next_registration = vm->node_main.node_registrations;             \
     vm->node_main.node_registrations = &x;                              \
 }                                                                       \
+static void __vlib_rm_node_registration_##x (void)                      \
+    __attribute__((__destructor__)) ;                                   \
+static void __vlib_rm_node_registration_##x (void)                      \
+{                                                                       \
+    vlib_main_t * vm = vlib_get_main();                                 \
+    VLIB_REMOVE_FROM_LINKED_LIST (vm->node_main.node_registrations,     \
+                                  &x, next_registration);               \
+}                                                                       \
 __VA_ARGS__ vlib_node_registration_t x
+#else
+#define VLIB_REGISTER_NODE(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					\
+  CLIB_MARCH_SFX(node##_fn_registration) =				\
+  { .function = &CLIB_MARCH_SFX (node##_fn), };				\
+									\
+static void __clib_constructor						\
+CLIB_MARCH_SFX (node##_multiarch_register) (void)			\
+{									\
+  extern vlib_node_registration_t node;					\
+  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;					\
+}									\
+uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (node##_fn)
 
 #if CLIB_DEBUG > 0
 #define VLIB_NODE_FUNCTION_CLONE_TEMPLATE(arch, fn)
@@ -320,6 +371,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)
@@ -332,6 +386,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. */