ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session: avoid all session cleanup on unlisten

Browse Source 
Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ifff49366ad538bf2dd64487cae17e7457dff064f
This commit is contained in:
Florin Coras
2020-04-13 23:35:55 +00:00
committed by Dave Barach
parent d724e4f43b
commit 1bd461615f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vnet/session/application_worker.c
View File

@ -230,24 +230,22 @@ app_worker_stop_listen_session (app_worker_t * app_wrk, session_t * ls)
if (PREDICT_FALSE (!sm_indexp)) if (PREDICT_FALSE (!sm_indexp))
return; return;
/* Dealloc fifos first, if any, to avoid cleanup attempt lower */ /* Dealloc fifos, if any (dgram listeners) */
if (ls->rx_fifo) if (ls->rx_fifo)
{ {
segment_manager_dealloc_fifos (ls->rx_fifo, ls->tx_fifo); segment_manager_dealloc_fifos (ls->rx_fifo, ls->tx_fifo);
ls->tx_fifo = ls->rx_fifo = 0; ls->tx_fifo = ls->rx_fifo = 0;
} }
/* Try to cleanup segment manager */
sm = segment_manager_get (*sm_indexp); sm = segment_manager_get (*sm_indexp);
if (app_wrk->first_segment_manager == *sm_indexp) if (sm && app_wrk->first_segment_manager != *sm_indexp)
{ {
/* Delete sessions but don't remove segment manager */ segment_manager_app_detach (sm);
app_wrk->first_segment_manager_in_use = 0; if (!segment_manager_has_fifos (sm))
segment_manager_del_sessions (sm); segment_manager_free (sm);
}
else
{
segment_manager_init_free (sm);
} }
hash_unset (app_wrk->listeners_table, handle); hash_unset (app_wrk->listeners_table, handle);
} }