Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vcl: fix test throughput computation
[vpp.git]
/
src
/
vlib
/
node_funcs.h
diff --git
a/src/vlib/node_funcs.h
b/src/vlib/node_funcs.h
index
577e013
..
a308b87
100644
(file)
--- a/
src/vlib/node_funcs.h
+++ b/
src/vlib/node_funcs.h
@@
-237,7
+237,7
@@
always_inline vlib_frame_t *
vlib_get_frame (vlib_main_t * vm, uword frame_index)
{
vlib_frame_t *f = vlib_get_frame_no_check (vm, frame_index);
vlib_get_frame (vlib_main_t * vm, uword frame_index)
{
vlib_frame_t *f = vlib_get_frame_no_check (vm, frame_index);
- ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
+ ASSERT (f->f
rame_f
lags & VLIB_FRAME_IS_ALLOCATED);
return f;
}
return f;
}
@@
-818,7
+818,15
@@
vlib_process_signal_event_helper (vlib_node_main_t * nm,
{
/* Waiting for both event and clock? */
if (p_flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT)
{
/* Waiting for both event and clock? */
if (p_flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT)
- delete_from_wheel = 1;
+ {
+ if (!TW (tw_timer_handle_is_free)
+ ((TWT (tw_timer_wheel) *) nm->timing_wheel,
+ p->stop_timer_handle))
+ delete_from_wheel = 1;
+ else
+ /* timer just popped so process should already be on the list */
+ add_to_pending = 0;
+ }
else
/* Waiting only for clock. Event will be queue and may be
handled when timer expires. */
else
/* Waiting only for clock. Event will be queue and may be
handled when timer expires. */