Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IPv6 ND Router discovery data plane (VPP-1095)
[vpp.git]
/
src
/
vlib
/
node.h
diff --git
a/src/vlib/node.h
b/src/vlib/node.h
index
1e2f4c3
..
2acd61c
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/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. */
#include <vlib/trace.h> /* for vlib_trace_filter_t */
/* Forward declaration. */
@@
-327,7
+326,7
@@
typedef struct vlib_node_t
/* Max number of vector elements to process at once per node. */
#define VLIB_FRAME_SIZE 256
/* Max number of vector elements to process at once per node. */
#define VLIB_FRAME_SIZE 256
-#define VLIB_FRAME_ALIGN
VLIB_MAX_CPU
S
+#define VLIB_FRAME_ALIGN
CLIB_CACHE_LINE_BYTE
S
/* Calling frame (think stack frame) for a node. */
typedef struct vlib_frame_t
/* Calling frame (think stack frame) for a node. */
typedef struct vlib_frame_t
@@
-344,9
+343,6
@@
typedef struct vlib_frame_t
/* Number of vector elements currently in frame. */
u16 n_vectors;
/* Number of vector elements currently in frame. */
u16 n_vectors;
- /* Owner thread / heap id */
- u16 thread_index;
-
/* Scalar and vector arguments to next node. */
u8 arguments[0];
} vlib_frame_t;
/* Scalar and vector arguments to next node. */
u8 arguments[0];
} vlib_frame_t;
@@
-418,6
+414,10
@@
typedef struct vlib_node_runtime_t
vlib_error_t *errors; /**< Vector of errors for this node. */
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
u32 clocks_since_last_overflow; /**< Number of clock cycles. */
u32 max_clock; /**< Maximum clock cycle for an
@@
-538,8
+538,14
@@
typedef struct
/* Pool of currently valid event types. */
vlib_process_event_type_t *event_type_pool;
/* 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. */
/* Default output function and its argument for any CLI outputs
within the process. */
@@
-660,7
+666,7
@@
typedef struct
vlib_pending_frame_t *pending_frames;
/* Timing wheel for scheduling time-based node dispatch. */
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;
vlib_signal_timed_event_data_t *signal_timed_event_data_pool;
@@
-668,7
+674,7
@@
typedef struct
u32 *data_from_advancing_timing_wheel;
/* CPU time of next process to be ready on timing wheel. */
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. */
/* Vector of process nodes.
One for each node of type VLIB_NODE_TYPE_PROCESS. */