aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/session/session_node.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2017-08-16 19:55:49 -0700
committerDave Wallace <dwallacelf@gmail.com>2017-08-29 18:53:11 +0000
commitc87c91d8b0e85997debaf575f2e30cc2702edf25 (patch)
tree49ac104b68b3212559bf00e3744a842072631264 /src/vnet/session/session_node.c
parent78d5abea8584041b872def163c39464087eed9ef (diff)
session: segment manager improvements
- cleanup connects segment manager even if first - fix segment manager allocation for listen sessions - improve handling of process private segments (mheaps/main heap) - added segment manager cli Change-Id: Ic2ca97c3622ab2286d5fb5772aeb57680e64f769 Signed-off-by: Florin Coras <fcoras@cisco.com> Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'src/vnet/session/session_node.c')
-rw-r--r--src/vnet/session/session_node.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c
index cd52742bc67..dec6d13ca84 100644
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -394,7 +394,6 @@ session_tx_fifo_dequeue_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node,
always_inline stream_session_t *
session_event_get_session (session_fifo_event_t * e, u8 thread_index)
{
- ASSERT (e->fifo->master_thread_index == thread_index);
return stream_session_get_if_valid (e->fifo->master_session_index,
thread_index);
}
@@ -643,6 +642,8 @@ skip_dequeue:
break;
case FIFO_EVENT_BUILTIN_RX:
s0 = session_event_get_session (e0, my_thread_index);
+ if (PREDICT_FALSE (!s0))
+ continue;
svm_fifo_unset_event (s0->server_rx_fifo);
app = application_get (s0->app_index);
app->cb_fns.builtin_server_rx_callback (s0);