aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjinsh <jinsh11@chinatelecom.cn>2023-03-07 14:32:06 +0800
committerMatthew Smith <mgsmith@netgate.com>2023-04-10 17:31:38 +0000
commitb7756b26a9cc6e04a969dec3914ad7e148086e91 (patch)
treeb6d54cd3d520751c5a461290320838a4c230e3e0
parent9aa4ac55b0a205e333e567f87c3cc9379af2363c (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>
-rw-r--r--src/vlib/main.c1
-rw-r--r--src/vlib/node_funcs.h7
2 files changed, 6 insertions, 2 deletions
diff --git a/src/vlib/main.c b/src/vlib/main.c
index 50eebbaa4a5..0f67bb86554 100644
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -1647,6 +1647,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 9f10d16c27f..a1fca14faad 100644
--- a/src/vlib/node_funcs.h
+++ b/src/vlib/node_funcs.h
@@ -999,8 +999,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;