Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: support multiple worker binds
[vpp.git]
/
src
/
vnet
/
session
/
session_api.c
diff --git
a/src/vnet/session/session_api.c
b/src/vnet/session/session_api.c
index
13a3376
..
aa29090
100755
(executable)
--- a/
src/vnet/session/session_api.c
+++ b/
src/vnet/session/session_api.c
@@
-147,7
+147,8
@@
send_del_segment_callback (u32 api_client_index, const ssvm_private_t * fs)
}
static int
}
static int
-send_app_cut_through_registration_add (u32 api_client_index, u64 mq_addr,
+send_app_cut_through_registration_add (u32 api_client_index,
+ u32 wrk_map_index, u64 mq_addr,
u64 peer_mq_addr)
{
vl_api_app_cut_through_registration_add_t *mp;
u64 peer_mq_addr)
{
vl_api_app_cut_through_registration_add_t *mp;
@@
-169,6
+170,7
@@
send_app_cut_through_registration_add (u32 api_client_index, u64 mq_addr,
mp->evt_q_address = mq_addr;
mp->peer_evt_q_address = peer_mq_addr;
mp->evt_q_address = mq_addr;
mp->peer_evt_q_address = peer_mq_addr;
+ mp->wrk_index = wrk_map_index;
mq = uword_to_pointer (mq_addr, svm_msg_q_t *);
peer_mq = uword_to_pointer (peer_mq_addr, svm_msg_q_t *);
mq = uword_to_pointer (mq_addr, svm_msg_q_t *);
peer_mq = uword_to_pointer (peer_mq_addr, svm_msg_q_t *);
@@
-253,7
+255,7
@@
send_session_accept_callback (stream_session_t * s)
}
else
{
}
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)
{
ls->listener_index);
if (ll->transport_listener_index != ~0)
{
@@
-443,7
+445,7
@@
mq_send_session_accepted_cb (stream_session_t * s)
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_ACCEPTED;
mp = (session_accepted_msg_t *) evt->data;
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);
mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
@@
-475,6
+477,7
@@
mq_send_session_accepted_cb (stream_session_t * s)
u8 main_thread = vlib_num_workers ()? 1 : 0;
send_app_cut_through_registration_add (app->api_client_index,
u8 main_thread = vlib_num_workers ()? 1 : 0;
send_app_cut_through_registration_add (app->api_client_index,
+ app_wrk->wrk_map_index,
ls->server_evt_q,
ls->client_evt_q);
ls->server_evt_q,
ls->client_evt_q);
@@
-486,9
+489,7
@@
mq_send_session_accepted_cb (stream_session_t * s)
}
else
{
}
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);
if (ll->transport_listener_index != ~0)
{
listener = listen_session_get (ll->transport_listener_index);
@@
-615,6
+616,7
@@
mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context,
u8 main_thread = vlib_num_workers ()? 1 : 0;
send_app_cut_through_registration_add (app->api_client_index,
u8 main_thread = vlib_num_workers ()? 1 : 0;
send_app_cut_through_registration_add (app->api_client_index,
+ app_wrk->wrk_map_index,
ls->client_evt_q,
ls->server_evt_q);
ls->client_evt_q,
ls->server_evt_q);
@@
-683,7
+685,7
@@
mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context,
else
{
local_session_t *local;
else
{
local_session_t *local;
- local = application_get_local_listen
_session_from
_handle (handle);
+ local = application_get_local_listen
er_w
_handle (handle);
mp->lcl_port = local->port;
mp->lcl_is_ip4 = session_type_is_ip4 (local->session_type);
}
mp->lcl_port = local->port;
mp->lcl_is_ip4 = session_type_is_ip4 (local->session_type);
}
@@
-1235,6
+1237,7
@@
vl_api_unbind_sock_t_handler (vl_api_unbind_sock_t * mp)
{
a->app_index = app->app_index;
a->handle = mp->handle;
{
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);
if ((error = vnet_unbind (a)))
{
rv = clib_error_get_code (error);
@@
-1251,7
+1254,7
@@
vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
{
vl_api_connect_session_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
{
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;
clib_error_t *error = 0;
int rv = 0;
@@
-1303,6
+1306,12
@@
vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
done:
REPLY_MACRO (VL_API_CONNECT_SESSION_REPLY);
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
}
static void