/* Error strings indexed by error code for this node. */
char **error_strings;
- vl_counter_t *error_counters;
+ vlib_error_desc_t *error_counters;
/* Buffer format/unformat for this node. */
format_function_t *format_buffer;
u8 protocol_hint;
/* Size of scalar and vector arguments in bytes. */
- u16 scalar_size, vector_size;
+ u8 vector_size, aux_size;
+ u16 scalar_size;
/* Number of error codes used by this node. */
u16 n_errors;
} 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) \
- __attribute__((__constructor__)) ; \
-static void __vlib_add_node_registration_##x (void) \
-{ \
- vlib_main_t * vm = vlib_get_main(); \
- 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_REGISTER_NODE(x, ...) \
+ __VA_ARGS__ vlib_node_registration_t x; \
+ static void __vlib_add_node_registration_##x (void) \
+ __attribute__ ((__constructor__)); \
+ static void __vlib_add_node_registration_##x (void) \
+ { \
+ vlib_global_main_t *vgm = vlib_get_global_main (); \
+ x.next_registration = vgm->node_registrations; \
+ vgm->node_registrations = &x; \
+ } \
+ static void __vlib_rm_node_registration_##x (void) \
+ __attribute__ ((__destructor__)); \
+ static void __vlib_rm_node_registration_##x (void) \
+ { \
+ vlib_global_main_t *vgm = vlib_get_global_main (); \
+ VLIB_REMOVE_FROM_LINKED_LIST (vgm->node_registrations, &x, \
+ next_registration); \
+ } \
+ __VA_ARGS__ vlib_node_registration_t x
#else
#define VLIB_REGISTER_NODE(x,...) \
STATIC_ASSERT (sizeof(# __VA_ARGS__) != 7,"node " #x " must not be declared as static"); \
r->next_registration = node.node_fn_registrations; \
node.node_fn_registrations = r; \
} \
- uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (node##_fn)
+ uword CLIB_MARCH_SFX (node##_fn)
unformat_function_t unformat_vlib_node_variant;
u32 runtime_index;
/* Runtime data for this node. */
- void *runtime_data;
+ u8 *runtime_data;
/* Node flags. */
u16 flags;
u16 n_errors;
/* Size of scalar and vector arguments in bytes. */
- u16 scalar_size, vector_size;
+ u16 frame_size, scalar_offset, vector_offset, magic_offset, aux_offset;
+ u16 frame_size_index;
/* Handle/index in error heap for this node. */
u32 error_heap_handle;
u32 error_heap_index;
/* Counter structures indexed by counter code for this node. */
- vl_counter_t *error_counters;
+ vlib_error_desc_t *error_counters;
/* Vector of next node names.
Only used before next_nodes array is initialized. */
/* Max number of vector elements to process at once per node. */
#define VLIB_FRAME_SIZE 256
-#define VLIB_FRAME_ALIGN CLIB_CACHE_LINE_BYTES
+/* Number of extra elements allocated at the end of vecttor. */
+#define VLIB_FRAME_SIZE_EXTRA 4
+/* Frame data alignment */
+#define VLIB_FRAME_DATA_ALIGN 16
/* Calling frame (think stack frame) for a node. */
typedef struct vlib_frame_t
/* User flags. Used for sending hints to the next node. */
u16 flags;
- /* Number of scalar bytes in arguments. */
- u8 scalar_size;
-
- /* Number of bytes per vector argument. */
- u8 vector_size;
+ /* Scalar, vector and aux offsets in this frame. */
+ u16 scalar_offset, vector_offset, aux_offset;
/* Number of vector elements currently in frame. */
u16 n_vectors;
+ /* Index of frame size corresponding to allocated node. */
+ u16 frame_size_index;
+
/* Scalar and vector arguments to next node. */
u8 arguments[0];
} vlib_frame_t;
/* A frame pending dispatch by main loop. */
typedef struct
{
- /* Node and runtime for this frame. */
- u32 node_runtime_index;
-
/* Frame index (in the heap). */
vlib_frame_t *frame;
+ /* Node and runtime for this frame. */
+ u32 node_runtime_index;
+
/* Start of next frames for this node. */
u32 next_frame_index;
zero before first run of this
node. */
- u16 thread_index; /**< thread this node runs on */
+ CLIB_ALIGN_MARK (runtime_data_pad, 8);
u8 runtime_data[0]; /**< Function dependent
node-runtime data. This data is
/* Number of allocated frames for this scalar/vector size. */
u32 n_alloc_frames;
+ /* Frame size */
+ u16 frame_size;
+
/* Vector of free frames for this scalar/vector size. */
vlib_frame_t **free_frames;
} vlib_frame_size_t;
+STATIC_ASSERT_SIZEOF (vlib_frame_size_t, 16);
+
typedef struct
{
/* Users opaque value for event type. */
u32 n_suspends;
/* Vectors of pending event data indexed by event type index. */
- void **pending_event_data_by_type_index;
+ u8 **pending_event_data_by_type_index;
/* Bitmap of event type-indices with non-empty vectors. */
uword *non_empty_event_type_bitmap;
/* Current counts of nodes in each state. */
u32 input_node_counts_by_state[VLIB_N_NODE_STATE];
- /* Hash of (scalar_size,vector_size) to frame_sizes index. */
- uword *frame_size_hash;
-
/* Per-size frame allocation information. */
vlib_frame_size_t *frame_sizes;
/* Time of last node runtime stats clear. */
f64 time_last_runtime_stats_clear;
- /* Node registrations added by constructors */
- vlib_node_registration_t *node_registrations;
-
/* Node index from error code */
u32 *node_by_error;
{
CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
u64 head;
- u64 head_hint;
u64 tail;
u32 n_in_use;
u32 nelts;
Code Review / vpp.git / blobdiff