diff options
Diffstat (limited to 'src/vcl/vcl_bapi.c')
| -rw-r--r-- | src/vcl/vcl_bapi.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c index ea8f2ce5651..7dd601cf737 100644 --- a/src/vcl/vcl_bapi.c +++ b/src/vcl/vcl_bapi.c @@ -148,17 +148,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; } - 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->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index); + if (!mp->is_add) return; - wrk = vcl_worker_get (wrk_index); wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address, svm_msg_q_t *); @@ -193,6 +189,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; + VDBG (0, "worker %u vpp-worker %u added", wrk_index, wrk->vpp_wrk_index); return; failed: @@ -432,7 +429,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->app_api_index = clib_host_to_net_u32 (vcm->my_client_index); + mp->app_api_index = clib_host_to_net_u32 (vcm->main_api_client_index); mp->context = wrk_index; mp->is_add = is_add; if (!is_add) @@ -444,6 +441,7 @@ vcl_send_app_worker_add_del (u8 is_add) 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)); @@ -451,7 +449,7 @@ 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->wrk_index = vcl_get_worker_index (); + cmp->wrk_index = wrk->vpp_wrk_index; cmp->is_ip4 = session->transport.is_ip4; clib_memcpy_fast (cmp->ip, &session->transport.rmt_ip, sizeof (cmp->ip)); cmp->port = session->transport.rmt_port; @@ -479,6 +477,7 @@ vppcom_send_disconnect_session (u64 vpp_handle) 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 */ @@ -488,7 +487,7 @@ 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->wrk_index = vcl_get_worker_index (); + bmp->wrk_index = wrk->vpp_wrk_index; bmp->is_ip4 = session->transport.is_ip4; clib_memcpy_fast (bmp->ip, &session->transport.lcl_ip, sizeof (bmp->ip)); bmp->port = session->transport.lcl_port; @@ -500,6 +499,7 @@ vppcom_send_bind_sock (vcl_session_t * session) 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)); @@ -507,7 +507,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->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); } @@ -556,15 +556,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 */ )) { - 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)) { - clib_warning ("VCL<%d>: app (%s) init shm failed!", - getpid (), app_name); + VERR ("app (%s) init shm failed!", app_name); return VPPCOM_ECONNREFUSED; } } @@ -573,14 +571,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); - 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) { - clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), - app_name); + VERR ("app (%s) connect failed!", app_name); return VPPCOM_ECONNREFUSED; } @@ -590,8 +587,7 @@ vppcom_connect_to_vpp (char *app_name) 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; } |