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: cleanup use of api_client_index
[vpp.git]
/
src
/
vcl
/
vcl_bapi.c
diff --git
a/src/vcl/vcl_bapi.c
b/src/vcl/vcl_bapi.c
index
0c46d82
..
cc494ed
100644
(file)
--- a/
src/vcl/vcl_bapi.c
+++ b/
src/vcl/vcl_bapi.c
@@
-131,6
+131,7
@@
vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
return;
}
return;
}
+ vcm->app_index = clib_net_to_host_u32 (mp->app_index);
vcm->app_state = STATE_APP_ATTACHED;
}
vcm->app_state = STATE_APP_ATTACHED;
}
@@
-148,14
+149,13
@@
vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t *
format_api_error, ntohl (mp->retval));
goto failed;
}
format_api_error, ntohl (mp->retval));
goto failed;
}
- wrk_index = clib_net_to_host_u32 (mp->wrk_index);
- if (mp->context != wrk_index)
- {
- clib_warning ("VCL<%d>: wrk numbering doesn't match ours: %u, vpp: %u",
- getpid (), mp->context, wrk_index);
- goto failed;
- }
+ wrk_index = mp->context;
wrk = vcl_worker_get (wrk_index);
wrk = vcl_worker_get (wrk_index);
+ wrk->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index);
+
+ if (!mp->is_add)
+ return;
+
wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address,
svm_msg_q_t *);
wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address,
svm_msg_q_t *);
@@
-190,6
+190,7
@@
vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t *
goto failed;
}
vcm->app_state = STATE_APP_READY;
goto failed;
}
vcm->app_state = STATE_APP_READY;
+ VDBG (0, "worker %u vpp-worker %u added", wrk_index, wrk->vpp_wrk_index);
return;
failed:
return;
failed:
@@
-312,7
+313,7
@@
vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t *
}
static void
}
static void
-vl_api_connect_s
ock
_reply_t_handler (vl_api_connect_sock_reply_t * mp)
+vl_api_connect_s
ession
_reply_t_handler (vl_api_connect_sock_reply_t * mp)
{
if (mp->retval)
clib_warning ("VCL<%d>: ERROR: sid %u: connect failed: %U",
{
if (mp->retval)
clib_warning ("VCL<%d>: ERROR: sid %u: connect failed: %U",
@@
-324,7
+325,7
@@
vl_api_connect_sock_reply_t_handler (vl_api_connect_sock_reply_t * mp)
_(SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \
_(BIND_SOCK_REPLY, bind_sock_reply) \
_(UNBIND_SOCK_REPLY, unbind_sock_reply) \
_(SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \
_(BIND_SOCK_REPLY, bind_sock_reply) \
_(UNBIND_SOCK_REPLY, unbind_sock_reply) \
-_(CONNECT_S
OCK_REPLY, connect_sock_reply)
\
+_(CONNECT_S
ESSION_REPLY, connect_session_reply)
\
_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \
_(APPLICATION_ATTACH_REPLY, application_attach_reply) \
_(APPLICATION_DETACH_REPLY, application_detach_reply) \
_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \
_(APPLICATION_ATTACH_REPLY, application_attach_reply) \
_(APPLICATION_DETACH_REPLY, application_detach_reply) \
@@
-398,7
+399,7
@@
vppcom_app_send_attach (void)
if (nsid_len)
{
bmp->namespace_id_len = nsid_len;
if (nsid_len)
{
bmp->namespace_id_len = nsid_len;
- clib_memcpy (bmp->namespace_id, vcm->cfg.namespace_id, nsid_len);
+ clib_memcpy
_fast
(bmp->namespace_id, vcm->cfg.namespace_id, nsid_len);
bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret;
}
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret;
}
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
@@
-429,6
+430,7
@@
vcl_send_app_worker_add_del (u8 is_add)
mp->_vl_msg_id = ntohs (VL_API_APP_WORKER_ADD_DEL);
mp->client_index = vcm->my_client_index;
mp->_vl_msg_id = ntohs (VL_API_APP_WORKER_ADD_DEL);
mp->client_index = vcm->my_client_index;
+ mp->app_index = clib_host_to_net_u32 (vcm->app_index);
mp->context = wrk_index;
mp->is_add = is_add;
if (!is_add)
mp->context = wrk_index;
mp->is_add = is_add;
if (!is_add)
@@
-440,6
+442,7
@@
vcl_send_app_worker_add_del (u8 is_add)
void
vppcom_send_connect_sock (vcl_session_t * session)
{
void
vppcom_send_connect_sock (vcl_session_t * session)
{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
vl_api_connect_sock_t *cmp;
cmp = vl_msg_api_alloc (sizeof (*cmp));
vl_api_connect_sock_t *cmp;
cmp = vl_msg_api_alloc (sizeof (*cmp));
@@
-447,12
+450,12
@@
vppcom_send_connect_sock (vcl_session_t * session)
cmp->_vl_msg_id = ntohs (VL_API_CONNECT_SOCK);
cmp->client_index = vcm->my_client_index;
cmp->context = session->session_index;
cmp->_vl_msg_id = ntohs (VL_API_CONNECT_SOCK);
cmp->client_index = vcm->my_client_index;
cmp->context = session->session_index;
- cmp->wrk_index =
vcl_get_worker_index ()
;
+ cmp->wrk_index =
wrk->vpp_wrk_index
;
cmp->is_ip4 = session->transport.is_ip4;
cmp->is_ip4 = session->transport.is_ip4;
- clib_memcpy (cmp->ip, &session->transport.rmt_ip, sizeof (cmp->ip));
+ clib_memcpy
_fast
(cmp->ip, &session->transport.rmt_ip, sizeof (cmp->ip));
cmp->port = session->transport.rmt_port;
cmp->proto = session->session_type;
cmp->port = session->transport.rmt_port;
cmp->proto = session->session_type;
- clib_memcpy (cmp->options, session->options, sizeof (cmp->options));
+ clib_memcpy
_fast
(cmp->options, session->options, sizeof (cmp->options));
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & cmp);
}
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & cmp);
}
@@
-475,6
+478,7
@@
vppcom_send_disconnect_session (u64 vpp_handle)
void
vppcom_send_bind_sock (vcl_session_t * session)
{
void
vppcom_send_bind_sock (vcl_session_t * session)
{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
vl_api_bind_sock_t *bmp;
/* Assumes caller has acquired spinlock: vcm->sessions_lockp */
vl_api_bind_sock_t *bmp;
/* Assumes caller has acquired spinlock: vcm->sessions_lockp */
@@
-484,18
+488,19
@@
vppcom_send_bind_sock (vcl_session_t * session)
bmp->_vl_msg_id = ntohs (VL_API_BIND_SOCK);
bmp->client_index = vcm->my_client_index;
bmp->context = session->session_index;
bmp->_vl_msg_id = ntohs (VL_API_BIND_SOCK);
bmp->client_index = vcm->my_client_index;
bmp->context = session->session_index;
- bmp->wrk_index =
vcl_get_worker_index ()
;
+ bmp->wrk_index =
wrk->vpp_wrk_index
;
bmp->is_ip4 = session->transport.is_ip4;
bmp->is_ip4 = session->transport.is_ip4;
- clib_memcpy (bmp->ip, &session->transport.lcl_ip, sizeof (bmp->ip));
+ clib_memcpy
_fast
(bmp->ip, &session->transport.lcl_ip, sizeof (bmp->ip));
bmp->port = session->transport.lcl_port;
bmp->proto = session->session_type;
bmp->port = session->transport.lcl_port;
bmp->proto = session->session_type;
- clib_memcpy (bmp->options, session->options, sizeof (bmp->options));
+ clib_memcpy
_fast
(bmp->options, session->options, sizeof (bmp->options));
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
}
void
vppcom_send_unbind_sock (u64 vpp_handle)
{
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
}
void
vppcom_send_unbind_sock (u64 vpp_handle)
{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
vl_api_unbind_sock_t *ump;
ump = vl_msg_api_alloc (sizeof (*ump));
vl_api_unbind_sock_t *ump;
ump = vl_msg_api_alloc (sizeof (*ump));
@@
-503,7
+508,7
@@
vppcom_send_unbind_sock (u64 vpp_handle)
ump->_vl_msg_id = ntohs (VL_API_UNBIND_SOCK);
ump->client_index = vcm->my_client_index;
ump->_vl_msg_id = ntohs (VL_API_UNBIND_SOCK);
ump->client_index = vcm->my_client_index;
- ump->wrk_index =
vcl_get_worker_index ()
;
+ ump->wrk_index =
wrk->vpp_wrk_index
;
ump->handle = vpp_handle;
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & ump);
}
ump->handle = vpp_handle;
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & ump);
}
@@
-552,15
+557,13
@@
vppcom_connect_to_vpp (char *app_name)
if (vl_socket_client_connect ((char *) vcl_cfg->vpp_api_socket_name,
app_name, 0 /* default rx/tx buffer */ ))
{
if (vl_socket_client_connect ((char *) vcl_cfg->vpp_api_socket_name,
app_name, 0 /* default rx/tx buffer */ ))
{
- clib_warning ("VCL<%d>: app (%s) socket connect failed!",
- getpid (), app_name);
+ VERR ("app (%s) socket connect failed!", app_name);
return VPPCOM_ECONNREFUSED;
}
if (vl_socket_client_init_shm (0))
{
return VPPCOM_ECONNREFUSED;
}
if (vl_socket_client_init_shm (0))
{
- clib_warning ("VCL<%d>: app (%s) init shm failed!",
- getpid (), app_name);
+ VERR ("app (%s) init shm failed!", app_name);
return VPPCOM_ECONNREFUSED;
}
}
return VPPCOM_ECONNREFUSED;
}
}
@@
-569,14
+572,13
@@
vppcom_connect_to_vpp (char *app_name)
if (!vcl_cfg->vpp_api_filename)
vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0);
if (!vcl_cfg->vpp_api_filename)
vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0);
- VDBG (0, "
VCL<%d>: app (%s) connecting to VPP api (%s)...", getpid ()
,
+ VDBG (0, "
app (%s) connecting to VPP api (%s)..."
,
app_name, vcl_cfg->vpp_api_filename);
if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename,
app_name, vcm->cfg.vpp_api_q_length) < 0)
{
app_name, vcl_cfg->vpp_api_filename);
if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename,
app_name, vcm->cfg.vpp_api_q_length) < 0)
{
- clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (),
- app_name);
+ VERR ("app (%s) connect failed!", app_name);
return VPPCOM_ECONNREFUSED;
}
return VPPCOM_ECONNREFUSED;
}
@@
-586,8
+588,7
@@
vppcom_connect_to_vpp (char *app_name)
vcm->my_client_index = (u32) am->my_client_index;
vcm->app_state = STATE_APP_CONN_VPP;
vcm->my_client_index = (u32) am->my_client_index;
vcm->app_state = STATE_APP_CONN_VPP;
- VDBG (0, "VCL<%d>: app (%s) is connected to VPP!", getpid (), app_name);
-
+ VDBG (0, "app (%s) is connected to VPP!", app_name);
vcl_evt (VCL_EVT_INIT, vcm);
return VPPCOM_OK;
}
vcl_evt (VCL_EVT_INIT, vcm);
return VPPCOM_OK;
}