diff options
| author |   Dave Barach <dave@barachs.net> | 2017-06-13 08:48:31 -0400 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2017-06-28 19:12:10 +0000 |
| commit | 5c20a0131a6a2516c14d5ccfc6db90fd13ec8a33 (patch) | |
| tree | 0e175b7e6be5ae87e2a35534b94eec35c5328986 /src/vlib/node.h | |
| parent | 31a71ab497616940c105fa1719515fe7ae37f37a (diff) | |
switch vlib process model to tw_timer_template timer impl
Change-Id: I36bb47faea55a6fea7af7ee58d87d8f6dd28f93d
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vlib/node.h')
| -rw-r--r-- | src/vlib/node.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/vlib/node.h b/src/vlib/node.h index 906d795fe23..77914272bbc 100644 --- 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. */ @@ -542,8 +541,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. */ @@ -664,7 +669,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; @@ -672,7 +677,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. */ |