diff options
| author |   jinsh <jinsh11@chinatelecom.cn> | 2023-03-07 14:32:06 +0800 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2023-09-13 17:01:20 +0000 |
| commit | 3be288f0d9214ed25303bb620b07b09e0a26f1e2 (patch) | |
| tree | 292089458b2258db46ba68abc6323c8b34517d68 | |
| parent | feb08c9c40df19c31f2fc640387b922e4c5f40ec (diff) | |
vlib:process node scheduling use timing_wheel have problem.
The time wheel should not be started in the loop while processing expired events.
can be set p->stop_timer_handle = ~0 to solve.
Type: fix
Signed-off-by: jinsh <jinsh11@chinatelecom.cn>
Change-Id: Ie9a4293f39f981f50d280b39a5d958d319ee2300
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
(cherry picked from commit b7756b26a9cc6e04a969dec3914ad7e148086e91)
| -rw-r--r-- | src/vlib/main.c | 1 | ||||
| -rw-r--r-- | src/vlib/node_funcs.h | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/vlib/main.c b/src/vlib/main.c index 964bc4a04e9..efbcdda68ec 100644 --- a/src/vlib/main.c +++ b/src/vlib/main.c @@ -1649,6 +1649,7 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) vlib_get_node (vm, te->process_node_index); vlib_process_t *p = vec_elt (nm->processes, n->runtime_index); + p->stop_timer_handle = ~0; void *data; data = vlib_process_signal_event_helper (nm, n, p, diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h index 115127ffee0..3b44150c9e6 100644 --- a/src/vlib/node_funcs.h +++ b/src/vlib/node_funcs.h @@ -998,8 +998,11 @@ vlib_process_signal_event_helper (vlib_node_main_t * nm, p->flags = p_flags | VLIB_PROCESS_RESUME_PENDING; vec_add1 (nm->data_from_advancing_timing_wheel, x); if (delete_from_wheel) - TW (tw_timer_stop) ((TWT (tw_timer_wheel) *) nm->timing_wheel, - p->stop_timer_handle); + { + TW (tw_timer_stop) + ((TWT (tw_timer_wheel) *) nm->timing_wheel, p->stop_timer_handle); + p->stop_timer_handle = ~0; + } } return data_to_be_written_by_caller; |