}
else
{
- ll = application_get_local_listen_session (server_wrk,
+ ll = application_get_local_listen_session (server,
ls->listener_index);
if (ll->transport_listener_index != ~0)
{
app_mq = app_wrk->event_queue;
svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
SVM_Q_WAIT, msg);
- svm_msg_q_unlock (app_mq);
evt = svm_msg_q_msg_data (app_mq, msg);
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_DISCONNECTED;
mp = (session_disconnected_msg_t *) evt->data;
mp->handle = application_local_session_handle (ls);
mp->context = app->api_client_index;
- svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+ svm_msg_q_add_and_unlock (app_mq, msg);
}
static void
.del_segment_callback = send_del_segment_callback,
};
+static int
+mq_try_lock_and_alloc_msg (svm_msg_q_t * app_mq, svm_msg_q_msg_t * msg)
+{
+ int rv;
+ u8 try = 0;
+ while (try < 100)
+ {
+ rv = svm_msg_q_lock_and_alloc_msg_w_ring (app_mq,
+ SESSION_MQ_CTRL_EVT_RING,
+ SVM_Q_NOWAIT, msg);
+ if (!rv)
+ return 0;
+ try++;
+ }
+ return -1;
+}
+
static int
mq_send_session_accepted_cb (stream_session_t * s)
{
app = application_get (app_wrk->app_index);
app_mq = app_wrk->event_queue;
- svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
- SVM_Q_WAIT, msg);
- svm_msg_q_unlock (app_mq);
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return -1;
evt = svm_msg_q_msg_data (app_mq, msg);
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_ACCEPTED;
mp = (session_accepted_msg_t *) evt->data;
- mp->context = app_wrk->wrk_index;
+ mp->context = app->app_index;
mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
}
else
{
- ll =
- application_get_local_listen_session (app_wrk,
- ls->listener_index);
+ ll = application_get_local_listen_session (app, ls->listener_index);
if (ll->transport_listener_index != ~0)
{
listener = listen_session_get (ll->transport_listener_index);
mp->client_event_queue_address = ls->client_evt_q;
mp->server_event_queue_address = ls->server_evt_q;
}
- svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+ svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
}
app = application_get (app_wrk->app_index);
app_mq = app_wrk->event_queue;
- svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
- SVM_Q_WAIT, msg);
- svm_msg_q_unlock (app_mq);
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return;
evt = svm_msg_q_msg_data (app_mq, msg);
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_DISCONNECTED;
mp = (session_disconnected_msg_t *) evt->data;
mp->handle = session_handle (s);
mp->context = app->api_client_index;
- svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+ svm_msg_q_add_and_unlock (app_mq, msg);
}
static void
session_event_t *evt;
app_mq = app->event_queue;
- svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
- SVM_Q_WAIT, msg);
- svm_msg_q_unlock (app_mq);
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return;
evt = svm_msg_q_msg_data (app_mq, msg);
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_RESET;
mp = (session_reset_msg_t *) evt->data;
mp->handle = session_handle (s);
- svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+ svm_msg_q_add_and_unlock (app_mq, msg);
}
static int
return -1;
}
- svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
- SVM_Q_WAIT, msg);
- svm_msg_q_unlock (app_mq);
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return -1;
evt = svm_msg_q_msg_data (app_mq, msg);
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_CONNECTED;
mp->retval = is_fail ?
clib_host_to_net_u32 (VNET_API_ERROR_SESSION_CONNECT) : 0;
- svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+ svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
}
return -1;
}
- svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
- SVM_Q_WAIT, msg);
- svm_msg_q_unlock (app_mq);
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return -1;
+
evt = svm_msg_q_msg_data (app_mq, msg);
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_BOUND;
else
{
local_session_t *local;
- local = application_get_local_listen_session_from_handle (handle);
+ local = application_get_local_listener_w_handle (handle);
mp->lcl_port = local->port;
mp->lcl_is_ip4 = session_type_is_ip4 (local->session_type);
}
done:
mp->retval = rv;
- svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+ svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
}
app = application_lookup (mp->client_index);
if (app)
{
+ memset (a, 0, sizeof (*a));
a->uri = (char *) mp->uri;
a->api_context = mp->context;
a->app_index = app->app_index;
{
a->app_index = app->app_index;
a->handle = mp->handle;
+ a->wrk_map_index = mp->wrk_index;
if ((error = vnet_unbind (a)))
{
rv = clib_error_get_code (error);
{
vl_api_connect_session_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
- application_t *app;
+ application_t *app = 0;
clib_error_t *error = 0;
int rv = 0;
done:
REPLY_MACRO (VL_API_CONNECT_SESSION_REPLY);
+
+ if (app && application_use_mq_for_ctrl (app))
+ {
+ app_worker_t *app_wrk = application_get_worker (app, mp->wrk_index);
+ mq_send_session_connected_cb (app_wrk->wrk_index, mp->context, 0, 1);
+ }
}
static void
if (!reg)
return;
- app = application_lookup (mp->app_api_index);
+ app = application_lookup (clib_net_to_host_u32 (mp->app_api_index));
if (!app)
{
rv = VNET_API_ERROR_INVALID_VALUE;
goto done;
}
- /* Make coverity happy */
- ASSERT (args.evt_q && args.segment);
+ if (!mp->is_add)
+ goto done;
/* Send fifo segment fd if needed */
if (ssvm_type (args.segment) == SSVM_SEGMENT_MEMFD)
done:
REPLY_MACRO2 (VL_API_APP_WORKER_ADD_DEL_REPLY, ({
rmp->is_add = mp->is_add;
- if (!rv)
+ rmp->wrk_index = clib_host_to_net_u32 (args.wrk_index);
+ if (!rv && mp->is_add)
{
- rmp->wrk_index = clib_host_to_net_u32 (args.wrk_index);
if (vec_len (args.segment->name))
{
memcpy (rmp->segment_name, args.segment->name,