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>

diff --git a/src/vlib/main.c b/src/vlib/main.c
index 50eebba..0f67bb8 100644 (file)
--- 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 9f10d16..a1fca14 100644 (file)
--- 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;