Add VLIB_NODE_FN() macro to simplify multiversioning of node functions

[vpp.git] / src / vlib / node.h

diff --git a/src/vlib/node.h b/src/vlib/node.h
index fc7e7da..67eaea3 100644 (file)
--- a/src/vlib/node.h
+++ b/src/vlib/node.h
@@ -43,7 +43,6 @@
 #include <vppinfra/cpu.h>
 #include <vppinfra/longjmp.h>
 #include <vppinfra/lock.h>
-#include <vppinfra/timing_wheel.h>
 #include <vlib/trace.h>                /* for vlib_trace_filter_t */
 
 /* Forward declaration. */
@@ -76,11 +75,21 @@ 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;
+} 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;
 
@@ -151,8 +160,34 @@ 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
 
+#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->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)
 #define VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)
@@ -327,7 +362,7 @@ typedef struct vlib_node_t
 
 /* Max number of vector elements to process at once per node. */
 #define VLIB_FRAME_SIZE 256
-#define VLIB_FRAME_ALIGN VLIB_MAX_CPUS
+#define VLIB_FRAME_ALIGN CLIB_CACHE_LINE_BYTES
 
 /* Calling frame (think stack frame) for a node. */
 typedef struct vlib_frame_t
@@ -344,9 +379,6 @@ typedef struct vlib_frame_t
   /* Number of vector elements currently in frame. */
   u16 n_vectors;
 
-  /* Owner cpuid / heap id */
-  u16 cpu_index;
-
   /* Scalar and vector arguments to next node. */
   u8 arguments[0];
 } vlib_frame_t;
@@ -418,6 +450,10 @@ typedef struct vlib_node_runtime_t
 
   vlib_error_t *errors;                        /**< Vector of errors for this node. */
 
+#if __SIZEOF_POINTER__ == 4
+  u8 pad[8];
+#endif
+
   u32 clocks_since_last_overflow;      /**< Number of clock cycles. */
 
   u32 max_clock;                       /**< Maximum clock cycle for an
@@ -459,7 +495,7 @@ typedef struct vlib_node_runtime_t
                                          zero before first run of this
                                          node. */
 
-  u16 cpu_index;                       /**< CPU this node runs on */
+  u16 thread_index;                    /**< thread this node runs on */
 
   u8 runtime_data[0];                  /**< Function dependent
                                          node-runtime data. This data is
@@ -538,8 +574,14 @@ typedef struct
   /* Pool of currently valid event types. */
   vlib_process_event_type_t *event_type_pool;
 
-  /* When suspending saves cpu cycle counter when process is to be resumed. */
-  u64 resume_cpu_time;
+  /*
+   * When suspending saves clock time (10us ticks) when process
+   * is to be resumed.
+   */
+  u64 resume_clock_interval;
+
+  /* Handle from timer code, to cancel an unexpired timer */
+  u32 stop_timer_handle;
 
   /* Default output function and its argument for any CLI outputs
      within the process. */
@@ -660,7 +702,7 @@ typedef struct
   vlib_pending_frame_t *pending_frames;
 
   /* Timing wheel for scheduling time-based node dispatch. */
-  timing_wheel_t timing_wheel;
+  void *timing_wheel;
 
   vlib_signal_timed_event_data_t *signal_timed_event_data_pool;
 
@@ -668,7 +710,7 @@ typedef struct
   u32 *data_from_advancing_timing_wheel;
 
   /* CPU time of next process to be ready on timing wheel. */
-  u64 cpu_time_next_process_ready;
+  f64 time_next_process_ready;
 
   /* Vector of process nodes.
      One for each node of type VLIB_NODE_TYPE_PROCESS. */