app_wrk->app_index = app->app_index;
app_wrk->wrk_map_index = ~0;
app_wrk->connects_seg_manager = APP_INVALID_SEGMENT_MANAGER_INDEX;
- app_wrk->first_segment_manager = APP_INVALID_SEGMENT_MANAGER_INDEX;
+ clib_spinlock_init (&app_wrk->detached_seg_managers_lock);
APP_DBG ("New app %v worker %u", app->name, app_wrk->wrk_index);
return app_wrk;
}
{
application_t *app = application_get (app_wrk->app_index);
vnet_unlisten_args_t _a, *a = &_a;
- u64 handle, *handles = 0;
+ u64 handle, *handles = 0, *sm_indices = 0;
segment_manager_t *sm;
+ session_handle_t *sh;
session_t *ls;
u32 sm_index;
- int i, j;
+ int i;
/*
* Listener cleanup
hash_foreach (handle, sm_index, app_wrk->listeners_table, ({
ls = listen_session_get_from_handle (handle);
vec_add1 (handles, app_listen_session_handle (ls));
+ vec_add1 (sm_indices, sm_index);
sm = segment_manager_get (sm_index);
- sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
}));
/* *INDENT-ON* */
- hash_free (app_wrk->listeners_table);
-
for (i = 0; i < vec_len (handles); i++)
{
+ /* Cleanup listener */
a->app_index = app->app_index;
a->wrk_map_index = app_wrk->wrk_map_index;
a->handle = handles[i];
- /* seg manager is removed when unbind completes */
(void) vnet_unlisten (a);
+
+ sm = segment_manager_get_if_valid (sm_indices[i]);
+ if (sm && !segment_manager_app_detached (sm))
+ {
+ sm->first_is_protected = 0;
+ segment_manager_init_free (sm);
+ }
}
vec_reset_length (handles);
+ vec_free (sm_indices);
+ hash_free (app_wrk->listeners_table);
/*
* Connects segment manager cleanup
* Half-open cleanup
*/
- for (i = 0; i < vec_len (app_wrk->half_open_table); i++)
- {
- if (!app_wrk->half_open_table[i])
- continue;
-
- /* *INDENT-OFF* */
- hash_foreach (handle, sm_index, app_wrk->half_open_table[i], ({
- vec_add1 (handles, handle);
- }));
- /* *INDENT-ON* */
-
- for (j = 0; j < vec_len (handles); j++)
- session_cleanup_half_open (i, handles[j]);
-
- hash_free (app_wrk->half_open_table[i]);
- vec_reset_length (handles);
- }
+ pool_foreach (sh, app_wrk->half_open_table)
+ session_cleanup_half_open (*sh);
- vec_free (app_wrk->half_open_table);
- vec_free (handles);
+ pool_free (app_wrk->half_open_table);
- /* If first segment manager is used by a listener */
- if (app_wrk->first_segment_manager != APP_INVALID_SEGMENT_MANAGER_INDEX
- && app_wrk->first_segment_manager != app_wrk->connects_seg_manager)
+ /*
+ * Detached listener segment managers cleanup
+ */
+ for (i = 0; i < vec_len (app_wrk->detached_seg_managers); i++)
{
- sm = segment_manager_get (app_wrk->first_segment_manager);
- sm->first_is_protected = 0;
- sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
- /* .. and has no fifos, e.g. it might be used for redirected sessions,
- * remove it */
- if (!segment_manager_has_fifos (sm))
- segment_manager_free (sm);
+ sm = segment_manager_get (app_wrk->detached_seg_managers[i]);
+ segment_manager_init_free (sm);
}
+ vec_free (app_wrk->detached_seg_managers);
+ clib_spinlock_free (&app_wrk->detached_seg_managers_lock);
if (CLIB_DEBUG)
clib_memset (app_wrk, 0xfe, sizeof (*app_wrk));
static segment_manager_t *
app_worker_alloc_segment_manager (app_worker_t * app_wrk)
{
- segment_manager_t *sm = 0;
-
- /* If the first segment manager is not in use, don't allocate a new one */
- if (app_wrk->first_segment_manager != APP_INVALID_SEGMENT_MANAGER_INDEX
- && app_wrk->first_segment_manager_in_use == 0)
- {
- sm = segment_manager_get (app_wrk->first_segment_manager);
- app_wrk->first_segment_manager_in_use = 1;
- return sm;
- }
+ segment_manager_t *sm;
sm = segment_manager_alloc ();
sm->app_wrk_index = app_wrk->wrk_index;
-
+ segment_manager_init (sm);
return sm;
}
&rx_fifo, &tx_fifo)))
return rv;
- rx_fifo->master_session_index = s->session_index;
+ rx_fifo->shr->master_session_index = s->session_index;
rx_fifo->master_thread_index = s->thread_index;
- tx_fifo->master_session_index = s->session_index;
+ tx_fifo->shr->master_session_index = s->session_index;
tx_fifo->master_thread_index = s->thread_index;
s->rx_fifo = rx_fifo;
return 0;
}
+static void
+app_worker_add_detached_sm (app_worker_t * app_wrk, u32 sm_index)
+{
+ vec_add1 (app_wrk->detached_seg_managers, sm_index);
+}
+
+void
+app_worker_del_detached_sm (app_worker_t * app_wrk, u32 sm_index)
+{
+ u32 i;
+
+ clib_spinlock_lock (&app_wrk->detached_seg_managers_lock);
+ for (i = 0; i < vec_len (app_wrk->detached_seg_managers); i++)
+ {
+ if (app_wrk->detached_seg_managers[i] == sm_index)
+ {
+ vec_del1 (app_wrk->detached_seg_managers, i);
+ break;
+ }
+ }
+ clib_spinlock_unlock (&app_wrk->detached_seg_managers_lock);
+}
+
static void
app_worker_stop_listen_session (app_worker_t * app_wrk, session_t * ls)
{
session_handle_t handle;
segment_manager_t *sm;
uword *sm_indexp;
+ session_state_t *states = 0;
handle = listen_session_get_handle (ls);
sm_indexp = hash_get (app_wrk->listeners_table, handle);
/* Try to cleanup segment manager */
sm = segment_manager_get (*sm_indexp);
- if (sm && app_wrk->first_segment_manager != *sm_indexp)
+ if (sm)
{
segment_manager_app_detach (sm);
if (!segment_manager_has_fifos (sm))
- segment_manager_free (sm);
+ {
+ /* Empty segment manager, cleanup it up */
+ segment_manager_free (sm);
+ }
+ else
+ {
+ /* Delete sessions in CREATED state */
+ vec_add1 (states, SESSION_STATE_CREATED);
+ segment_manager_del_sessions_filter (sm, states);
+ vec_free (states);
+
+ /* Track segment manager in case app detaches and all the
+ * outstanding sessions need to be closed */
+ app_worker_add_detached_sm (app_wrk, *sm_indexp);
+ sm->flags |= SEG_MANAGER_F_DETACHED_LISTENER;
+ }
}
hash_unset (app_wrk->listeners_table, handle);
application_t *app = application_get (app_wrk->app_index);
segment_manager_t *sm;
- /* Allocate fifos for session, unless the app is a builtin proxy */
- if (!application_is_builtin_proxy (app))
- {
- sm = app_worker_get_connect_segment_manager (app_wrk);
- return app_worker_alloc_session_fifos (sm, s);
- }
-
if (app->cb_fns.fifo_tuning_callback)
s->flags |= SESSION_F_CUSTOM_FIFO_TUNING;
- return 0;
+ /* Allocate fifos for session, unless the app is a builtin proxy */
+ if (application_is_builtin_proxy (app))
+ return 0;
+
+ sm = app_worker_get_connect_segment_manager (app_wrk);
+ return app_worker_alloc_session_fifos (sm, s);
}
int
}
int
-app_worker_add_half_open (app_worker_t * app_wrk, transport_proto_t tp,
- session_handle_t ho_handle,
- session_handle_t wrk_handle)
+app_worker_add_half_open (app_worker_t *app_wrk, session_handle_t sh)
{
+ session_handle_t *shp;
+
ASSERT (vlib_get_thread_index () == 0);
- vec_validate (app_wrk->half_open_table, tp);
- hash_set (app_wrk->half_open_table[tp], ho_handle, wrk_handle);
- return 0;
+ pool_get (app_wrk->half_open_table, shp);
+ *shp = sh;
+
+ return (shp - app_wrk->half_open_table);
}
int
-app_worker_del_half_open (app_worker_t * app_wrk, transport_proto_t tp,
- session_handle_t ho_handle)
+app_worker_del_half_open (app_worker_t *app_wrk, u32 ho_index)
{
ASSERT (vlib_get_thread_index () == 0);
- hash_unset (app_wrk->half_open_table[tp], ho_handle);
+ pool_put_index (app_wrk->half_open_table, ho_index);
return 0;
}
-u64
-app_worker_lookup_half_open (app_worker_t * app_wrk, transport_proto_t tp,
- session_handle_t ho_handle)
-{
- u64 *ho_wrk_handlep;
-
- /* No locking because all updates are done from main thread */
- ho_wrk_handlep = hash_get (app_wrk->half_open_table[tp], ho_handle);
- if (!ho_wrk_handlep)
- return SESSION_INVALID_HANDLE;
-
- return *ho_wrk_handlep;
-}
-
int
app_worker_close_notify (app_worker_t * app_wrk, session_t * s)
{
s->rx_fifo = 0;
s->tx_fifo = 0;
- sm = app_worker_get_or_alloc_connect_segment_manager (app_wrk);
+ sm = app_worker_get_connect_segment_manager (app_wrk);
if (app_worker_alloc_session_fifos (sm, s))
return -1;
}
int
-app_worker_connect_session (app_worker_t * app, session_endpoint_t * sep,
+app_worker_connect_session (app_worker_t * app_wrk, session_endpoint_t * sep,
u32 api_context)
{
int rv;
- /* Make sure we have a segment manager for connects */
- app_worker_alloc_connects_segment_manager (app);
-
- if ((rv = session_open (app->wrk_index, sep, api_context)))
+ if ((rv = session_open (app_wrk->wrk_index, sep, api_context)))
return rv;
return 0;
return app->cb_fns.fifo_tuning_callback (s, f, act, len);
}
-int
-app_worker_alloc_connects_segment_manager (app_worker_t * app_wrk)
-{
- segment_manager_t *sm;
-
- if (app_wrk->connects_seg_manager == APP_INVALID_SEGMENT_MANAGER_INDEX)
- {
- sm = app_worker_alloc_segment_manager (app_wrk);
- if (sm == 0)
- return -1;
- app_wrk->connects_seg_manager = segment_manager_index (sm);
- }
- return 0;
-}
-
segment_manager_t *
app_worker_get_connect_segment_manager (app_worker_t * app)
{
return segment_manager_get (app->connects_seg_manager);
}
-segment_manager_t *
-app_worker_get_or_alloc_connect_segment_manager (app_worker_t * app_wrk)
-{
- if (app_wrk->connects_seg_manager == (u32) ~ 0)
- app_worker_alloc_connects_segment_manager (app_wrk);
- return segment_manager_get (app_wrk->connects_seg_manager);
-}
-
segment_manager_t *
app_worker_get_listen_segment_manager (app_worker_t * app,
session_t * listener)
msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING);
evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
- evt->session_index = s->rx_fifo->client_session_index;
+ evt->session_index = s->rx_fifo->shr->client_session_index;
evt->event_type = SESSION_IO_EVT_RX;
(void) svm_fifo_set_event (s->rx_fifo);
msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING);
evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
evt->event_type = SESSION_IO_EVT_TX;
- evt->session_index = s->tx_fifo->client_session_index;
+ evt->session_index = s->tx_fifo->shr->client_session_index;
svm_msg_q_add_and_unlock (mq, &msg);
return 0;
if (!app_wrk)
{
if (verbose)
- s = format (s, "%-40s%-25s%=10s%-15s%-15s%-10s", "Connection", "App",
+ s = format (s, "%-40s%-25s%-10s%-15s%-15s%-10s", "Connection", "App",
"Wrk", "API Client", "ListenerID", "SegManager");
else
- s = format (s, "%-40s%-25s%=10s", "Connection", "App", "Wrk");
+ s = format (s, "%-40s%-25s%-10s", "Connection", "App", "Wrk");
return s;
}
{
u8 *buf;
buf = format (0, "%u(%u)", app_wrk->wrk_map_index, app_wrk->wrk_index);
- s = format (s, "%-40s%-25s%=10v%-15u%-15u%-10u", str, app_name,
+ s = format (s, "%-40v%-25v%-10v%-15u%-15u%-10u", str, app_name,
buf, app_wrk->api_client_index, handle, sm_index);
vec_free (buf);
}
else
- s = format (s, "%-40s%-25s%=10u", str, app_name, app_wrk->wrk_map_index);
+ s = format (s, "%-40v%-25v%=10u", str, app_name, app_wrk->wrk_map_index);
+
+ vec_free (str);
return s;
}
Code Review / vpp.git / blobdiff