X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=3cd2e766f63eb392cabe79c7d9b022ce4b0144aa;hb=refs%2Fchanges%2F61%2F13261%2F5;hp=e8366d70566452e57a0b7bcf42b2e09010ce8d4d;hpb=e535644dd3066eb843c7b0056a7f6346a36e702a;p=vpp.git diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index e8366d70566..3cd2e766f63 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -22,9 +22,9 @@ #include #include #include +#include #include #include -#include #define vl_typedefs /* define message structures */ #include @@ -133,10 +133,9 @@ do { \ typedef struct { - volatile session_state_t state; - - svm_fifo_t *rx_fifo; - svm_fifo_t *tx_fifo; +#define _(type, name) type name; + foreach_app_session_field +#undef _ u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF) u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF) u32 user_mss; // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG) @@ -144,7 +143,6 @@ typedef struct u32 sm_seg_index; u32 client_context; u64 vpp_handle; - svm_queue_t *vpp_event_queue; /* Socket configuration state */ u8 is_vep; @@ -153,16 +151,13 @@ typedef struct u32 wait_cont_idx; vppcom_epoll_t vep; int libc_epfd; - vppcom_ip46_t lcl_addr; - vppcom_ip46_t peer_addr; - u16 lcl_port; // network order - u16 peer_port; // network order - u8 proto; u64 client_queue_address; u64 options[16]; - elog_track_t elog_track; vce_event_handler_reg_t *poll_reg; -} session_t; +#if VCL_ELOG + elog_track_t elog_track; +#endif +} vcl_session_t; typedef struct vppcom_cfg_t_ { @@ -190,26 +185,6 @@ typedef struct vppcom_cfg_t_ u8 *vpp_api_filename; } vppcom_cfg_t; -/* VPPCOM Event typedefs */ -typedef enum vcl_event_id_ -{ - VCL_EVENT_INVALID_EVENT, - VCL_EVENT_CONNECT_REQ_ACCEPTED, - VCL_EVENT_N_EVENTS -} vcl_event_id_t; - -typedef struct vce_event_connect_request_ -{ - u32 accepted_session_index; -} vce_event_connect_request_t; - -typedef struct vppcom_session_listener -{ - vppcom_session_listener_cb user_cb; - vppcom_session_listener_errcb user_errcb; - void *user_cb_data; -} vppcom_session_listener_t; - typedef struct vppcom_main_t_ { u8 init; @@ -227,7 +202,7 @@ typedef struct vppcom_main_t_ u32 my_client_index; /* Session pool */ clib_spinlock_t sessions_lockp; - session_t *sessions; + vcl_session_t *sessions; /* Hash table for disconnect processing */ uword *session_index_by_vpp_handles; @@ -254,9 +229,14 @@ typedef struct vppcom_main_t_ /* Event thread */ vce_event_thread_t event_thread; + /* IO thread */ + vppcom_session_io_thread_t session_io_thread; + +#ifdef VCL_ELOG /* VPP Event-logger */ elog_main_t elog_main; elog_track_t elog_track; +#endif /* VNET_API_ERROR_FOO -> "Foo" hash table */ uword *error_string_by_error_number; @@ -273,7 +253,7 @@ static vppcom_main_t _vppcom_main = { static vppcom_main_t *vcm = &_vppcom_main; -#define VCL_LOCK_AND_GET_SESSION(I, S) \ +#define VCL_SESSION_LOCK_AND_GET(I, S) \ do { \ clib_spinlock_lock (&vcm->sessions_lockp); \ rv = vppcom_session_at_index (I, S); \ @@ -286,6 +266,23 @@ do { \ } \ } while (0) +#define VCL_SESSION_LOCK() clib_spinlock_lock (&(vcm->sessions_lockp)) +#define VCL_SESSION_UNLOCK() clib_spinlock_unlock (&(vcm->sessions_lockp)) + +#define VCL_IO_SESSIONS_LOCK() \ + clib_spinlock_lock (&(vcm->session_io_thread.io_sessions_lockp)) +#define VCL_IO_SESSIONS_UNLOCK() \ + clib_spinlock_unlock (&(vcm->session_io_thread.io_sessions_lockp)) + +#define VCL_ACCEPT_FIFO_LOCK() clib_spinlock_lock (&(vcm->session_fifo_lockp)) +#define VCL_ACCEPT_FIFO_UNLOCK() \ + clib_spinlock_unlock (&(vcm->session_fifo_lockp)) + +#define VCL_EVENTS_LOCK() \ + clib_spinlock_lock (&(vcm->event_thread.events_lockp)) +#define VCL_EVENTS_UNLOCK() \ + clib_spinlock_unlock (&(vcm->event_thread.events_lockp)) + static const char * vppcom_app_state_str (app_state_t state) { @@ -364,8 +361,9 @@ vppcom_session_state_str (session_state_t state) /* * VPPCOM Utility Functions */ + static inline int -vppcom_session_at_index (u32 session_index, session_t * volatile *sess) +vppcom_session_at_index (u32 session_index, vcl_session_t * volatile *sess) { /* Assumes that caller has acquired spinlock: vcm->sessions_lockp */ if (PREDICT_FALSE ((session_index == ~0) || @@ -389,12 +387,12 @@ vppcom_session_table_add_listener (u64 listener_handle, u32 value) hash_set (vcm->session_index_by_vpp_handles, listener_handle, value); } -static inline session_t * +static inline vcl_session_t * vppcom_session_table_lookup_listener (u64 listener_handle) { uword *p; u64 handle = listener_handle | (1ULL << 63); - session_t *session; + vcl_session_t *session; p = hash_get (vcm->session_index_by_vpp_handles, handle); if (!p) @@ -405,14 +403,12 @@ vppcom_session_table_lookup_listener (u64 listener_handle) } if (pool_is_free_index (vcm->sessions, p[0])) { - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: invalid listen session, sid (%u)", - getpid (), p[0]); + VDBG (1, "VCL<%d>: invalid listen session, sid (%u)", getpid (), p[0]); return 0; } session = pool_elt_at_index (vcm->sessions, p[0]); - ASSERT (session->state & STATE_LISTEN); + ASSERT (session->session_state & STATE_LISTEN); return session; } @@ -423,26 +419,6 @@ vppcom_session_table_del_listener (u64 listener_handle) hash_unset (vcm->session_index_by_vpp_handles, listener_handle); } -static void -write_elog (void) -{ - elog_main_t *em = &vcm->elog_main; - char *chroot_file; - clib_error_t *error = 0; - - chroot_file = - (char *) format (0, "%s/%d-%d-vcl-elog%c", vcm->cfg.event_log_path, - vcm->my_client_index, getpid (), 0); - error = elog_write_file (em, chroot_file, 1 /* flush ring */ ); - if (error) - { - clib_error_report (error); - } - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] Event Log:'%s' ", getpid (), chroot_file); - -} - static inline void vppcom_send_accept_session_reply (u64 handle, u32 context, int retval) { @@ -457,105 +433,6 @@ vppcom_send_accept_session_reply (u64 handle, u32 context, int retval) vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp); } -/* - * VPPCOM Event Functions - */ - -void -vce_registered_listener_connect_handler_fn (void *arg) -{ - vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; - vce_event_connect_request_t *ecr; - vce_event_t *ev; - vppcom_endpt_t ep; - - session_t *new_session; - int rv; - - vppcom_session_listener_t *session_listener = - (vppcom_session_listener_t *) reg->handler_fn_args; - - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - - ecr = (vce_event_connect_request_t *) ev->data; - VCL_LOCK_AND_GET_SESSION (ecr->accepted_session_index, &new_session); - - - ep.is_ip4 = new_session->peer_addr.is_ip4; - ep.port = new_session->peer_port; - if (new_session->peer_addr.is_ip4) - clib_memcpy (&ep.ip, &new_session->peer_addr.ip46.ip4, - sizeof (ip4_address_t)); - else - clib_memcpy (&ep.ip, &new_session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); - - vppcom_send_accept_session_reply (new_session->vpp_handle, - new_session->client_context, - 0 /* retval OK */ ); - clib_spinlock_unlock (&vcm->sessions_lockp); - - (session_listener->user_cb) (ecr->accepted_session_index, &ep, - session_listener->user_cb_data); - - /*TODO - Unregister check in close for this listener */ - - return; - -done: - ASSERT (0); // If we can't get a lock or accepted session fails, lets blow up. -} - -/** - * * @brief vce_connect_request_handler_fn - * - used for listener sessions - * - when a vl_api_accept_session_t_handler() generates an event - * this callback is alerted and sets fields that consumers such as - * vppcom_session_accept() expect to see, ie. accepted_client_index - * - * @param arg - void* to be cast to vce_event_handler_reg_t* - */ -void -vce_connect_request_handler_fn (void *arg) -{ - vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; - - pthread_mutex_lock (®->handler_lock); - pthread_cond_signal (®->handler_cond); - pthread_mutex_unlock (®->handler_lock); -} - -/** - * @brief vce_poll_wait_connect_request_handler_fn - * - used by vppcom_epoll_xxxx() for listener sessions - * - when a vl_api_accept_session_t_handler() generates an event - * this callback is alerted and sets the fields that vppcom_epoll_wait() - * expects to see. - * - * @param arg - void* to be cast to vce_event_handler_reg_t* - */ -void -vce_poll_wait_connect_request_handler_fn (void *arg) -{ - vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; - vce_event_t *ev; - /* Retrieve the VCL_EVENT_CONNECT_REQ_ACCEPTED event */ - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - vce_event_connect_request_t *ecr = (vce_event_connect_request_t *) ev->data; - - /* Add the accepted_session_index to the FIFO */ - clib_spinlock_lock (&vcm->session_fifo_lockp); - clib_fifo_add1 (vcm->client_session_index_fifo, - ecr->accepted_session_index); - clib_spinlock_unlock (&vcm->session_fifo_lockp); - - /* Recycling the event. */ - clib_spinlock_lock (&(vcm->event_thread.events_lockp)); - vcm->event_thread.recycle_event = 1; - clib_fifo_add1 (vcm->event_thread.event_index_fifo, reg->ev_idx); - clib_spinlock_unlock (&(vcm->event_thread.events_lockp)); -} - static int vppcom_connect_to_vpp (char *app_name) { @@ -566,9 +443,8 @@ 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 (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: app (%s) connecting to VPP api (%s)...", - getpid (), app_name, vcl_cfg->vpp_api_filename); + VDBG (0, "VCL<%d>: app (%s) connecting to VPP api (%s)...", + getpid (), 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) @@ -582,39 +458,10 @@ vppcom_connect_to_vpp (char *app_name) vcm->my_client_index = (u32) am->my_client_index; vcm->app_state = STATE_APP_CONN_VPP; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: app (%s) is connected to VPP!", - getpid (), app_name); + VDBG (0, "VCL<%d>: app (%s) is connected to VPP!", getpid (), app_name); } - if (VPPCOM_DEBUG > 0) - { - vcm->elog_main.lock = - clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES); - vcm->elog_main.lock[0] = 0; - vcm->elog_main.event_ring_size = vcm->cfg.event_ring_size; - elog_init (&vcm->elog_main, vcm->elog_main.event_ring_size); - elog_enable_disable (&vcm->elog_main, 1); - - vcm->elog_track.name = - (char *) format (0, "P:%d:C:%d%c", getpid (), - vcm->my_client_index, 0); - elog_track_register (&vcm->elog_main, &vcm->elog_track); - - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "connect_vpp:rv:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); - ed->data = (u32) rv; - /* *INDENT-ON* */ - } + vcl_evt (VCL_EVT_INIT, vcm); return rv; } @@ -655,28 +502,9 @@ vppcom_wait_for_app_state_change (app_state_t app_state) if (vcm->app_state == app_state) return VPPCOM_OK; } - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: timeout waiting for state %s (%d)", getpid (), - vppcom_app_state_str (app_state), app_state); - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR: timeout state:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); - - ed->data = app_state; - /* *INDENT-ON* */ - } + VDBG (0, "VCL<%d>: timeout waiting for state %s (%d)", getpid (), + vppcom_app_state_str (app_state), app_state); + vcl_evt (VCL_EVT_SESSION_TIMEOUT, vcm, app_state); return VPPCOM_ETIMEDOUT; } @@ -687,55 +515,36 @@ vppcom_wait_for_session_state_change (u32 session_index, f64 wait_for_time) { f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; - session_t *volatile session; + vcl_session_t *volatile session; int rv; do { - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); rv = vppcom_session_at_index (session_index, &session); if (PREDICT_FALSE (rv)) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); return rv; } - if (session->state & state) + if (session->session_state & state) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); return VPPCOM_OK; } - if (session->state & STATE_FAILED) + if (session->session_state & STATE_FAILED) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); return VPPCOM_ECONNREFUSED; } - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } while (clib_time_now (&vcm->clib_time) < timeout); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: timeout waiting for state 0x%x (%s)", getpid (), - state, vppcom_session_state_str (state)); - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR: timeout state:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = state; - /* *INDENT-ON* */ - } + VDBG (0, "VCL<%d>: timeout waiting for state 0x%x (%s)", getpid (), state, + vppcom_session_state_str (state)); + vcl_evt (VCL_EVT_SESSION_TIMEOUT, session, session_state); return VPPCOM_ETIMEDOUT; } @@ -768,10 +577,8 @@ vppcom_app_session_enable (void) rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); if (PREDICT_FALSE (rv)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: application session enable timed out! " - "returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); + VDBG (0, "VCL<%d>: application session enable timed out! " + "returning %d (%s)", getpid (), rv, vppcom_retval_str (rv)); return rv; } } @@ -811,8 +618,8 @@ vppcom_app_send_attach (void) (vcm->cfg.app_scope_global ? APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE : 0) | (app_is_proxy ? APP_OPTIONS_FLAGS_IS_PROXY : 0); bmp->options[APP_OPTIONS_PROXY_TRANSPORT] = - (vcm->cfg.app_proxy_transport_tcp ? 1 << TRANSPORT_PROTO_TCP : 0) | - (vcm->cfg.app_proxy_transport_udp ? 1 << TRANSPORT_PROTO_UDP : 0); + (u64) ((vcm->cfg.app_proxy_transport_tcp ? 1 << TRANSPORT_PROTO_TCP : 0) | + (vcm->cfg.app_proxy_transport_udp ? 1 << TRANSPORT_PROTO_UDP : 0)); bmp->options[APP_OPTIONS_SEGMENT_SIZE] = vcm->cfg.segment_size; bmp->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = vcm->cfg.add_segment_size; bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = vcm->cfg.rx_fifo_size; @@ -838,10 +645,8 @@ vppcom_app_attach (void) rv = vppcom_wait_for_app_state_change (STATE_APP_ATTACHED); if (PREDICT_FALSE (rv)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: application attach timed out! " - "returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); + VDBG (0, "VCL<%d>: application attach timed out! returning %d (%s)", + getpid (), rv, vppcom_retval_str (rv)); return rv; } @@ -944,9 +749,9 @@ vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) getpid (), mp->segment_name); return; } - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: mapped new segment '%s' size %d", getpid (), - mp->segment_name, mp->segment_size); + + VDBG (1, "VCL<%d>: mapped new segment '%s' size %d", getpid (), + mp->segment_name, mp->segment_size); } static void @@ -957,8 +762,8 @@ vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp) * XXX Need segment_name to session_id hash, * XXX - have sessionID by handle hash currently */ - if (VPPCOM_DEBUG > 1) - clib_warning ("Unmapped segment '%s'", mp->segment_name); + + VDBG (1, "Unmapped segment '%s'", mp->segment_name); } static void @@ -970,25 +775,22 @@ vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp) if (p) { int rv; - session_t *session = 0; + vcl_session_t *session = 0; u32 session_index = p[0]; - VCL_LOCK_AND_GET_SESSION (session_index, &session); - session->state = STATE_CLOSE_ON_EMPTY; + VCL_SESSION_LOCK_AND_GET (session_index, &session); + session->session_state = STATE_CLOSE_ON_EMPTY; - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "setting state to 0x%x (%s)", - getpid (), mp->handle, session_index, session->state, - vppcom_session_state_str (session->state)); - clib_spinlock_unlock (&vcm->sessions_lockp); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: setting state to 0x%x " + "(%s)", getpid (), mp->handle, session_index, + session->session_state, + vppcom_session_state_str (session->session_state)); + VCL_SESSION_UNLOCK (); return; done: - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "session lookup failed!", - getpid (), mp->handle, session_index); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session lookup failed!", + getpid (), mp->handle, session_index); } else clib_warning ("VCL<%d>: vpp handle 0x%llx: session lookup by " @@ -998,7 +800,7 @@ vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp) static void vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) { - session_t *session = 0; + vcl_session_t *session = 0; vl_api_reset_session_reply_t *rmp; uword *p; int rv = 0; @@ -1007,7 +809,7 @@ vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) if (p) { int rval; - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); rval = vppcom_session_at_index (p[0], &session); if (PREDICT_FALSE (rval)) { @@ -1022,15 +824,13 @@ vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) /* TBD: should this disconnect immediately and * flush the fifos? */ - session->state = STATE_CLOSE_ON_EMPTY; + session->session_state = STATE_CLOSE_ON_EMPTY; - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "state set to %d (%s)!", getpid (), - mp->handle, p[0], session->state, - vppcom_session_state_str (session->state)); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: state set to %d " + "(%s)!", getpid (), mp->handle, p[0], session->session_state, + vppcom_session_state_str (session->session_state)); } - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } else { @@ -1051,13 +851,13 @@ vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) static void vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) { - session_t *session = 0; + vcl_session_t *session = 0; u32 session_index; svm_fifo_t *rx_fifo, *tx_fifo; int rv = VPPCOM_OK; session_index = mp->context; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); done: if (mp->retval) { @@ -1067,7 +867,7 @@ done: format_api_error, ntohl (mp->retval)); if (session) { - session->state = STATE_FAILED; + session->session_state = STATE_FAILED; session->vpp_handle = mp->handle; } else @@ -1085,8 +885,18 @@ done: /* * Setup session */ - session->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address, - svm_queue_t *); + if (vcm->session_io_thread.io_sessions_lockp) + { + // Add this connection to the active io sessions list + VCL_IO_SESSIONS_LOCK (); + u32 *active_session_index; + pool_get (vcm->session_io_thread.active_session_indexes, + active_session_index); + *active_session_index = session_index; + VCL_IO_SESSIONS_UNLOCK (); + } + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_queue_t *); rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); rx_fifo->client_session_index = session_index; @@ -1096,29 +906,25 @@ done: session->rx_fifo = rx_fifo; session->tx_fifo = tx_fifo; session->vpp_handle = mp->handle; - session->lcl_addr.is_ip4 = mp->is_ip4; - clib_memcpy (&session->lcl_addr.ip46, mp->lcl_ip, - sizeof (session->peer_addr.ip46)); - session->lcl_port = mp->lcl_port; - session->state = STATE_CONNECT; + session->transport.is_ip4 = mp->is_ip4; + clib_memcpy (&session->transport.lcl_ip, mp->lcl_ip, + sizeof (session->transport.rmt_ip)); + session->transport.lcl_port = mp->lcl_port; + session->session_state = STATE_CONNECT; /* Add it to lookup table */ hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connect succeeded!" - " session_rx_fifo %p, refcnt %d," - " session_tx_fifo %p, refcnt %d", - getpid (), mp->handle, session_index, - session->rx_fifo, - session->rx_fifo->refcnt, - session->tx_fifo, session->tx_fifo->refcnt); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: connect succeeded! " + "session_rx_fifo %p, refcnt %d, session_tx_fifo %p, refcnt %d", + getpid (), mp->handle, session_index, session->rx_fifo, + session->rx_fifo->refcnt, session->tx_fifo, session->tx_fifo->refcnt); done_unlock: - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } static void -vppcom_send_connect_sock (session_t * session, u32 session_index) +vppcom_send_connect_sock (vcl_session_t * session, u32 session_index) { vl_api_connect_sock_t *cmp; @@ -1129,10 +935,10 @@ vppcom_send_connect_sock (session_t * session, u32 session_index) cmp->client_index = vcm->my_client_index; cmp->context = session_index; - cmp->is_ip4 = session->peer_addr.is_ip4; - clib_memcpy (cmp->ip, &session->peer_addr.ip46, sizeof (cmp->ip)); - cmp->port = session->peer_port; - cmp->proto = session->proto; + cmp->is_ip4 = session->transport.is_ip4; + clib_memcpy (cmp->ip, &session->transport.rmt_ip, sizeof (cmp->ip)); + cmp->port = session->transport.rmt_port; + cmp->proto = session->session_type; clib_memcpy (cmp->options, session->options, sizeof (cmp->options)); vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & cmp); } @@ -1143,10 +949,8 @@ vppcom_send_disconnect_session_reply (u64 vpp_handle, u32 session_index, { vl_api_disconnect_session_reply_t *rmp; - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect msg", - getpid (), vpp_handle, session_index); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect msg", + getpid (), vpp_handle, session_index); rmp = vl_msg_api_alloc (sizeof (*rmp)); memset (rmp, 0, sizeof (*rmp)); @@ -1162,10 +966,8 @@ vppcom_send_disconnect_session (u64 vpp_handle, u32 session_index) { vl_api_disconnect_session_t *dmp; - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect msg", - getpid (), vpp_handle, session_index); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect msg", + getpid (), vpp_handle, session_index); dmp = vl_msg_api_alloc (sizeof (*dmp)); memset (dmp, 0, sizeof (*dmp)); @@ -1178,11 +980,11 @@ vppcom_send_disconnect_session (u64 vpp_handle, u32 session_index) static void vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp) { - session_t *session = 0; + vcl_session_t *session = 0; u32 session_index = mp->context; int rv; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); done: if (mp->retval) { @@ -1193,7 +995,7 @@ done: rv = vppcom_session_at_index (session_index, &session); if (rv == VPPCOM_OK) { - session->state = STATE_FAILED; + session->session_state = STATE_FAILED; session->vpp_handle = mp->handle; } else @@ -1206,18 +1008,17 @@ done: } session->vpp_handle = mp->handle; - session->lcl_addr.is_ip4 = mp->lcl_is_ip4; - clib_memcpy (&session->lcl_addr.ip46, mp->lcl_ip, - sizeof (session->peer_addr.ip46)); - session->lcl_port = mp->lcl_port; + session->transport.is_ip4 = mp->lcl_is_ip4; + session->transport.lcl_ip = to_ip46 (mp->lcl_is_ip4 ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, mp->lcl_ip); + session->transport.lcl_port = mp->lcl_port; vppcom_session_table_add_listener (mp->handle, session_index); - session->state = STATE_LISTEN; + session->session_state = STATE_LISTEN; - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!", - getpid (), mp->handle, mp->context); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!", + getpid (), mp->handle, mp->context); done_unlock: - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } static void @@ -1228,9 +1029,8 @@ vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp) getpid (), mp->context, format_api_error, ntohl (mp->retval)); - else if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: sid %u: unbind succeeded!", - getpid (), mp->context); + else + VDBG (1, "VCL<%d>: sid %u: unbind succeeded!", getpid (), mp->context); } u8 * @@ -1320,7 +1120,7 @@ static void vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) { svm_fifo_t *rx_fifo, *tx_fifo; - session_t *session, *listen_session; + vcl_session_t *session, *listen_session; u32 session_index; vce_event_connect_request_t *ecr; vce_event_t *ev; @@ -1328,18 +1128,18 @@ vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) u32 ev_idx; uword elts = 0; - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); - clib_spinlock_lock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_LOCK (); elts = clib_fifo_free_elts (vcm->client_session_index_fifo); - clib_spinlock_unlock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_UNLOCK (); if (!elts) { clib_warning ("VCL<%d>: client session queue is full!", getpid ()); vppcom_send_accept_session_reply (mp->handle, mp->context, VNET_API_ERROR_QUEUE_FULL); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); return; } @@ -1351,7 +1151,7 @@ vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) getpid (), mp->listener_handle); vppcom_send_accept_session_reply (mp->handle, mp->context, VNET_API_ERROR_INVALID_ARGUMENT); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); return; } @@ -1361,7 +1161,7 @@ vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) /* Allocate local session and set it up */ pool_get (vcm->sessions, session); memset (session, 0, sizeof (*session)); - session_index = session - vcm->sessions; + session_index = (u32) (session - vcm->sessions); rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); rx_fifo->client_session_index = session_index; @@ -1372,91 +1172,51 @@ vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) session->client_context = mp->context; session->rx_fifo = rx_fifo; session->tx_fifo = tx_fifo; - session->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address, - svm_queue_t *); - session->state = STATE_ACCEPT; - session->peer_port = mp->port; - session->peer_addr.is_ip4 = mp->is_ip4; - clib_memcpy (&session->peer_addr.ip46, mp->ip, - sizeof (session->peer_addr.ip46)); + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_queue_t *); + session->session_state = STATE_ACCEPT; + session->transport.rmt_port = mp->port; + session->transport.is_ip4 = mp->is_ip4; + session->transport.rmt_ip = to_ip46 (mp->is_ip4 ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, mp->ip); /* Add it to lookup table */ hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); - session->lcl_port = listen_session->lcl_port; - session->lcl_addr = listen_session->lcl_addr; + session->transport.lcl_port = listen_session->transport.lcl_port; + session->transport.lcl_ip = listen_session->transport.lcl_ip; /* Create an event for handlers */ - clib_spinlock_lock (&vcm->event_thread.events_lockp); + VCL_EVENTS_LOCK (); pool_get (vcm->event_thread.vce_events, ev); - ev->data = clib_mem_alloc (sizeof (vce_event_connect_request_t)); - ev->refcnt = 0; ev_idx = (u32) (ev - vcm->event_thread.vce_events); - ecr = ev->data; + ecr = vce_get_event_data (ev, sizeof (*ecr)); ev->evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; listen_session = vppcom_session_table_lookup_listener (mp->listener_handle); ev->evk.session_index = (u32) (listen_session - vcm->sessions); ecr->accepted_session_index = session_index; - clib_spinlock_unlock (&vcm->event_thread.events_lockp); + VCL_EVENTS_UNLOCK (); rv = vce_generate_event (&vcm->event_thread, ev_idx); - ASSERT (rv == 0); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: client accept " - "request from %s address %U port %d queue %p!", getpid (), - mp->handle, session_index, mp->is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, &mp->ip, mp->is_ip4, - clib_net_to_host_u16 (mp->port), session->vpp_event_queue); - - if (VPPCOM_DEBUG > 0) - { - session->elog_track.name = - (char *) format (0, "C:%d:S:%d%c", vcm->my_client_index, - session_index, 0); - elog_track_register (&vcm->elog_main, &session->elog_track); - - if (session->peer_addr.is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = - "client_accept:handle:%x addr:%d.%d.%d.%d:%d", - .format_args = "i8i1i1i1i1i2", - }; - - CLIB_PACKED (struct { - u64 handle; //8 - u8 addr[4]; //4 - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->handle = mp->handle; - ed->addr[0] = session->peer_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->peer_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->peer_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->peer_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - else - { - clib_warning ("ip6"); - } - } - - clib_spinlock_unlock (&vcm->sessions_lockp); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: client accept request from %s" + " address %U port %d queue %p!", getpid (), mp->handle, session_index, + mp->is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &mp->ip, + mp->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (mp->port), session->vpp_evt_q); + vcl_evt (VCL_EVT_ACCEPT, session, listen_session, session_index); + VCL_SESSION_UNLOCK (); } +/* VPP combines bind and listen as one operation. VCL manages the separation + * of bind and listen locally via vppcom_session_bind() and + * vppcom_session_listen() */ static void -vppcom_send_bind_sock (session_t * session, u32 session_index) +vppcom_send_bind_sock (vcl_session_t * session, u32 session_index) { vl_api_bind_sock_t *bmp; @@ -1467,10 +1227,10 @@ vppcom_send_bind_sock (session_t * session, u32 session_index) bmp->_vl_msg_id = ntohs (VL_API_BIND_SOCK); bmp->client_index = vcm->my_client_index; bmp->context = session_index; - bmp->is_ip4 = session->lcl_addr.is_ip4; - clib_memcpy (bmp->ip, &session->lcl_addr.ip46, sizeof (bmp->ip)); - bmp->port = session->lcl_port; - bmp->proto = session->proto; + bmp->is_ip4 = session->transport.is_ip4; + clib_memcpy (bmp->ip, &session->transport.lcl_ip, sizeof (bmp->ip)); + bmp->port = session->transport.lcl_port; + bmp->proto = session->session_type; clib_memcpy (bmp->options, session->options, sizeof (bmp->options)); vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); } @@ -1492,47 +1252,23 @@ vppcom_send_unbind_sock (u64 vpp_handle) static int vppcom_session_unbind (u32 session_index) { - session_t *session = 0; + vcl_session_t *session = 0; int rv; u64 vpp_handle; - elog_track_t session_elog_track; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); vpp_handle = session->vpp_handle; vppcom_session_table_del_listener (vpp_handle); session->vpp_handle = ~0; - session->state = STATE_DISCONNECT; - session_elog_track = session->elog_track; - - clib_spinlock_unlock (&vcm->sessions_lockp); - - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending unbind msg! new state 0x%x (%s)", - getpid (), vpp_handle, session_index, - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT)); + session->session_state = STATE_DISCONNECT; - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "unbind: handle:%x", - .format_args = "i8", - }; - - struct - { - u64 handle; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - ed->handle = vpp_handle; - /* *INDENT-ON* */ - } + VCL_SESSION_UNLOCK (); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending unbind msg! new state" + " 0x%x (%s)", getpid (), vpp_handle, session_index, STATE_DISCONNECT, + vppcom_session_state_str (STATE_DISCONNECT)); + vcl_evt (VCL_EVT_UNBIND, session); vppcom_send_unbind_sock (vpp_handle); done: @@ -1543,23 +1279,18 @@ static inline int vppcom_session_disconnect (u32 session_index) { int rv; - session_t *session; + vcl_session_t *session; u64 vpp_handle; session_state_t state; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); vpp_handle = session->vpp_handle; - state = session->state; - clib_spinlock_unlock (&vcm->sessions_lockp); + state = session->session_state; + VCL_SESSION_UNLOCK (); - if (VPPCOM_DEBUG > 1) - { - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u " - "state 0x%x (%s)", - getpid (), vpp_handle, session_index, - state, vppcom_session_state_str (state)); - } + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u state 0x%x (%s)", getpid (), + vpp_handle, session_index, state, vppcom_session_state_str (state)); if (PREDICT_FALSE (state & STATE_LISTEN)) { @@ -1578,20 +1309,16 @@ vppcom_session_disconnect (u32 session_index) //XXX alagalah - Check and drain here? vppcom_send_disconnect_session_reply (vpp_handle, session_index, 0 /* rv */ ); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect REPLY...", - getpid (), vpp_handle, session_index); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect " + "REPLY...", getpid (), vpp_handle, session_index); } /* Otherwise, send a disconnect session msg... */ else { - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect...", - getpid (), vpp_handle, session_index); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect...", + getpid (), vpp_handle, session_index); vppcom_send_disconnect_session (vpp_handle, session_index); } @@ -1669,19 +1396,16 @@ vppcom_cfg_heapsize (char *conf_fname) fp = fopen (conf_fname, "r"); if (fp == NULL) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: using default heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: using default heapsize %lld (0x%llx)", getpid (), + vcl_cfg->heapsize, vcl_cfg->heapsize); goto defaulted; } argv = calloc (1, sizeof (char *)); if (argv == NULL) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: calloc failed, using default " - "heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: calloc failed, using default heapsize %lld (0x%llx)", + getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); goto defaulted; } @@ -1698,22 +1422,18 @@ vppcom_cfg_heapsize (char *conf_fname) char **tmp = realloc (argv, argc * sizeof (char *)); if (tmp == NULL) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: realloc failed, " - "using default heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, - vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: realloc failed, using default heapsize %lld " + "(0x%llx)", getpid (), vcl_cfg->heapsize, + vcl_cfg->heapsize); goto defaulted; } argv = tmp; arg = strndup (p, 1024); if (arg == NULL) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: strndup failed, " - "using default heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, - vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: strndup failed, using default heapsize %lld " + "(0x%llx)", getpid (), vcl_cfg->heapsize, + vcl_cfg->heapsize); goto defaulted; } argv[argc - 1] = arg; @@ -1727,10 +1447,8 @@ vppcom_cfg_heapsize (char *conf_fname) char **tmp = realloc (argv, (argc + 1) * sizeof (char *)); if (tmp == NULL) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: realloc failed, " - "using default heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: realloc failed, using default heapsize %lld " + "(0x%llx)", getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); goto defaulted; } argv = tmp; @@ -1756,11 +1474,9 @@ vppcom_cfg_heapsize (char *conf_fname) } if (size == 0) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: parse error '%s %s', " - "using default heapsize %lld (0x%llx)", - getpid (), argv[i], argv[i + 1], - vcl_cfg->heapsize, vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: parse error '%s %s', using default " + "heapsize %lld (0x%llx)", getpid (), argv[i], argv[i + 1], + vcl_cfg->heapsize, vcl_cfg->heapsize); goto defaulted; } @@ -1770,11 +1486,9 @@ vppcom_cfg_heapsize (char *conf_fname) vcl_cfg->heapsize = size << 20; else { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: parse error '%s %s', " - "using default heapsize %lld (0x%llx)", - getpid (), argv[i], argv[i + 1], - vcl_cfg->heapsize, vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: parse error '%s %s', using default " + "heapsize %lld (0x%llx)", getpid (), argv[i], argv[i + 1], + vcl_cfg->heapsize, vcl_cfg->heapsize); goto defaulted; } } @@ -1815,9 +1529,8 @@ defaulted: clib_memcpy (vcl_mem, &_vppcom_main, sizeof (_vppcom_main)); vcm = vcl_mem; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: allocated VCL heap = %p, size %lld (0x%llx)", - getpid (), heap, vcl_cfg->heapsize, vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: allocated VCL heap = %p, size %lld (0x%llx)", getpid (), + heap, vcl_cfg->heapsize, vcl_cfg->heapsize); } static void @@ -1835,25 +1548,22 @@ vppcom_cfg_read (char *conf_fname) fd = open (conf_fname, O_RDONLY); if (fd < 0) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: using default configuration.", - getpid (), conf_fname); + VDBG (0, "VCL<%d>: using default configuration.", getpid (), + conf_fname); goto file_done; } if (fstat (fd, &s) < 0) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: failed to stat `%s', " - "using default configuration", getpid (), conf_fname); + VDBG (0, "VCL<%d>: failed to stat `%s', using default configuration", + getpid (), conf_fname); goto file_done; } if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode))) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: not a regular file `%s', " - "using default configuration", getpid (), conf_fname); + VDBG (0, "VCL<%d>: not a regular file `%s', using default " + "configuration", getpid (), conf_fname); goto file_done; } @@ -1875,11 +1585,9 @@ vppcom_cfg_read (char *conf_fname) if (unformat (line_input, "heapsize %s", &chroot_path)) { vec_terminate_c_string (chroot_path); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured heapsize %s, " - "actual heapsize %lld (0x%llx)", - getpid (), chroot_path, vcl_cfg->heapsize, - vcl_cfg->heapsize); + VDBG (0, "VCL<%d>: configured heapsize %s, actual heapsize %lld" + " (0x%llx)", getpid (), chroot_path, vcl_cfg->heapsize, + vcl_cfg->heapsize); vec_free (chroot_path); } else if (unformat (line_input, "api-prefix %s", &chroot_path)) @@ -1891,10 +1599,9 @@ vppcom_cfg_read (char *conf_fname) chroot_path, 0); vl_set_memory_root_path ((char *) chroot_path); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured api-prefix (%s) and " - "api filename (%s)", getpid (), chroot_path, - vcl_cfg->vpp_api_filename); + VDBG (0, "VCL<%d>: configured api-prefix (%s) and api filename" + " (%s)", getpid (), chroot_path, + vcl_cfg->vpp_api_filename); chroot_path = 0; /* Don't vec_free() it! */ } else if (unformat (line_input, "vpp-api-q-length %d", &q_len)) @@ -1909,200 +1616,159 @@ vppcom_cfg_read (char *conf_fname) { vcl_cfg->vpp_api_q_length = q_len; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured vpp-api-q-length %u", - getpid (), vcl_cfg->vpp_api_q_length); + VDBG (0, "VCL<%d>: configured vpp-api-q-length %u", + getpid (), vcl_cfg->vpp_api_q_length); } } else if (unformat (line_input, "uid %d", &uid)) { vl_set_memory_uid (uid); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured uid %d", getpid (), uid); + VDBG (0, "VCL<%d>: configured uid %d", getpid (), uid); } else if (unformat (line_input, "gid %d", &gid)) { vl_set_memory_gid (gid); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured gid %d", getpid (), gid); + VDBG (0, "VCL<%d>: configured gid %d", getpid (), gid); } else if (unformat (line_input, "segment-baseva 0x%lx", &vcl_cfg->segment_baseva)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured segment_baseva 0x%lx", - getpid (), vcl_cfg->segment_baseva); + VDBG (0, "VCL<%d>: configured segment_baseva 0x%lx", getpid (), + vcl_cfg->segment_baseva); } else if (unformat (line_input, "segment-size 0x%lx", &vcl_cfg->segment_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured segment_size 0x%lx (%ld)", - getpid (), vcl_cfg->segment_size, - vcl_cfg->segment_size); + VDBG (0, "VCL<%d>: configured segment_size 0x%lx (%ld)", + getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); } else if (unformat (line_input, "segment-size %ld", &vcl_cfg->segment_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured segment_size %ld (0x%lx)", - getpid (), vcl_cfg->segment_size, - vcl_cfg->segment_size); + VDBG (0, "VCL<%d>: configured segment_size %ld (0x%lx)", + getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); } else if (unformat (line_input, "add-segment-size 0x%lx", &vcl_cfg->add_segment_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning - ("VCL<%d>: configured add_segment_size 0x%lx (%ld)", - getpid (), vcl_cfg->add_segment_size, - vcl_cfg->add_segment_size); + VDBG (0, "VCL<%d>: configured add_segment_size 0x%lx (%ld)", + getpid (), vcl_cfg->add_segment_size, + vcl_cfg->add_segment_size); } else if (unformat (line_input, "add-segment-size %ld", &vcl_cfg->add_segment_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning - ("VCL<%d>: configured add_segment_size %ld (0x%lx)", - getpid (), vcl_cfg->add_segment_size, - vcl_cfg->add_segment_size); + VDBG (0, "VCL<%d>: configured add_segment_size %ld (0x%lx)", + getpid (), vcl_cfg->add_segment_size, + vcl_cfg->add_segment_size); } else if (unformat (line_input, "preallocated-fifo-pairs %d", &vcl_cfg->preallocated_fifo_pairs)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured preallocated_fifo_pairs " - "%d (0x%x)", getpid (), - vcl_cfg->preallocated_fifo_pairs, - vcl_cfg->preallocated_fifo_pairs); + VDBG (0, "VCL<%d>: configured preallocated_fifo_pairs %d " + "(0x%x)", getpid (), vcl_cfg->preallocated_fifo_pairs, + vcl_cfg->preallocated_fifo_pairs); } else if (unformat (line_input, "rx-fifo-size 0x%lx", &vcl_cfg->rx_fifo_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured rx_fifo_size 0x%lx (%ld)", - getpid (), vcl_cfg->rx_fifo_size, - vcl_cfg->rx_fifo_size); + VDBG (0, "VCL<%d>: configured rx_fifo_size 0x%lx (%ld)", + getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size); } else if (unformat (line_input, "rx-fifo-size %ld", &vcl_cfg->rx_fifo_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured rx_fifo_size %ld (0x%lx)", - getpid (), vcl_cfg->rx_fifo_size, - vcl_cfg->rx_fifo_size); + VDBG (0, "VCL<%d>: configured rx_fifo_size %ld (0x%lx)", + getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size); } else if (unformat (line_input, "tx-fifo-size 0x%lx", &vcl_cfg->tx_fifo_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured tx_fifo_size 0x%lx (%ld)", - getpid (), vcl_cfg->tx_fifo_size, - vcl_cfg->tx_fifo_size); + VDBG (0, "VCL<%d>: configured tx_fifo_size 0x%lx (%ld)", + getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size); } else if (unformat (line_input, "tx-fifo-size %ld", &vcl_cfg->tx_fifo_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured tx_fifo_size %ld (0x%lx)", - getpid (), vcl_cfg->tx_fifo_size, - vcl_cfg->tx_fifo_size); + VDBG (0, "VCL<%d>: configured tx_fifo_size %ld (0x%lx)", + getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size); } else if (unformat (line_input, "event-queue-size 0x%lx", &vcl_cfg->event_queue_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured event_queue_size " - "0x%lx (%ld)", - getpid (), vcl_cfg->event_queue_size, - vcl_cfg->event_queue_size); + VDBG (0, "VCL<%d>: configured event_queue_size 0x%lx (%ld)", + getpid (), vcl_cfg->event_queue_size, + vcl_cfg->event_queue_size); } else if (unformat (line_input, "event-queue-size %ld", &vcl_cfg->event_queue_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured event_queue_size " - "%ld (0x%lx)", - getpid (), vcl_cfg->event_queue_size, - vcl_cfg->event_queue_size); + VDBG (0, "VCL<%d>: configured event_queue_size %ld (0x%lx)", + getpid (), vcl_cfg->event_queue_size, + vcl_cfg->event_queue_size); } else if (unformat (line_input, "listen-queue-size 0x%lx", &vcl_cfg->listen_queue_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured listen_queue_size " - "0x%lx (%ld)", - getpid (), vcl_cfg->listen_queue_size, - vcl_cfg->listen_queue_size); + VDBG (0, "VCL<%d>: configured listen_queue_size 0x%lx (%ld)", + getpid (), vcl_cfg->listen_queue_size, + vcl_cfg->listen_queue_size); } else if (unformat (line_input, "listen-queue-size %ld", &vcl_cfg->listen_queue_size)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured listen_queue_size " - "%ld (0x%lx)", - getpid (), vcl_cfg->listen_queue_size, - vcl_cfg->listen_queue_size); + VDBG (0, "VCL<%d>: configured listen_queue_size %ld (0x%lx)", + getpid (), vcl_cfg->listen_queue_size, + vcl_cfg->listen_queue_size); } else if (unformat (line_input, "app-timeout %f", &vcl_cfg->app_timeout)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_timeout %f", - getpid (), vcl_cfg->app_timeout); + VDBG (0, "VCL<%d>: configured app_timeout %f", + getpid (), vcl_cfg->app_timeout); } else if (unformat (line_input, "session-timeout %f", &vcl_cfg->session_timeout)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured session_timeout %f", - getpid (), vcl_cfg->session_timeout); + VDBG (0, "VCL<%d>: configured session_timeout %f", + getpid (), vcl_cfg->session_timeout); } else if (unformat (line_input, "accept-timeout %f", &vcl_cfg->accept_timeout)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured accept_timeout %f", - getpid (), vcl_cfg->accept_timeout); + VDBG (0, "VCL<%d>: configured accept_timeout %f", + getpid (), vcl_cfg->accept_timeout); } else if (unformat (line_input, "app-proxy-transport-tcp")) { vcl_cfg->app_proxy_transport_tcp = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured " - "app_proxy_transport_tcp (%d)", - getpid (), vcl_cfg->app_proxy_transport_tcp); + VDBG (0, "VCL<%d>: configured app_proxy_transport_tcp (%d)", + getpid (), vcl_cfg->app_proxy_transport_tcp); } else if (unformat (line_input, "app-proxy-transport-udp")) { vcl_cfg->app_proxy_transport_udp = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured " - "app_proxy_transport_udp (%d)", - getpid (), vcl_cfg->app_proxy_transport_udp); + VDBG (0, "VCL<%d>: configured app_proxy_transport_udp (%d)", + getpid (), vcl_cfg->app_proxy_transport_udp); } else if (unformat (line_input, "app-scope-local")) { vcl_cfg->app_scope_local = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_scope_local (%d)", - getpid (), vcl_cfg->app_scope_local); + VDBG (0, "VCL<%d>: configured app_scope_local (%d)", + getpid (), vcl_cfg->app_scope_local); } else if (unformat (line_input, "app-scope-global")) { vcl_cfg->app_scope_global = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_scope_global (%d)", - getpid (), vcl_cfg->app_scope_global); + VDBG (0, "VCL<%d>: configured app_scope_global (%d)", + getpid (), vcl_cfg->app_scope_global); } else if (unformat (line_input, "namespace-secret %lu", &vcl_cfg->namespace_secret)) { - if (VPPCOM_DEBUG > 0) - clib_warning - ("VCL<%d>: configured namespace_secret %lu (0x%lx)", - getpid (), vcl_cfg->namespace_secret, - vcl_cfg->namespace_secret); + VDBG (0, "VCL<%d>: configured namespace_secret %lu (0x%lx)", + getpid (), vcl_cfg->namespace_secret, + vcl_cfg->namespace_secret); } else if (unformat (line_input, "namespace-id %v", &vcl_cfg->namespace_id)) @@ -2113,22 +1779,19 @@ vppcom_cfg_read (char *conf_fname) if (nsid_vec_len > max_nsid_vec_len) { _vec_len (vcl_cfg->namespace_id) = max_nsid_vec_len; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured namespace_id is " - "too long, truncated to %d characters!", - getpid (), max_nsid_vec_len); + VDBG (0, "VCL<%d>: configured namespace_id is too long," + " truncated to %d characters!", + getpid (), max_nsid_vec_len); } - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured namespace_id %v", - getpid (), vcl_cfg->namespace_id); + VDBG (0, "VCL<%d>: configured namespace_id %v", + getpid (), vcl_cfg->namespace_id); } else if (unformat (line_input, "}")) { vc_cfg_input = 0; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: completed parsing vppcom config!", - getpid ()); + VDBG (0, "VCL<%d>: completed parsing vppcom config!", + getpid ()); goto input_done; } else @@ -2180,9 +1843,8 @@ vppcom_app_create (char *app_name) else { vcm->debug = tmp; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured VCL debug level (%u) from " - VPPCOM_ENV_DEBUG "!", getpid (), vcm->debug); + VDBG (0, "VCL<%d>: configured VCL debug level (%u) from " + VPPCOM_ENV_DEBUG "!", getpid (), vcm->debug); } } conf_fname = getenv (VPPCOM_ENV_CONF); @@ -2195,6 +1857,7 @@ vppcom_app_create (char *app_name) vcm->cfg.listen_queue_size); vppcom_cfg_read (conf_fname); + env_var_str = getenv (VPPCOM_ENV_API_PREFIX); if (env_var_str) { @@ -2204,10 +1867,9 @@ vppcom_app_create (char *app_name) env_var_str, 0); vl_set_memory_root_path ((char *) env_var_str); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured api prefix (%s) and " - "filename (%s) from " VPPCOM_ENV_API_PREFIX "!", - getpid (), env_var_str, vcl_cfg->vpp_api_filename); + VDBG (0, "VCL<%d>: configured api prefix (%s) and filename (%s) " + "from " VPPCOM_ENV_API_PREFIX "!", + getpid (), env_var_str, vcl_cfg->vpp_api_filename); } env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID); if (env_var_str) @@ -2218,10 +1880,9 @@ vppcom_app_create (char *app_name) vec_validate (vcm->cfg.namespace_id, ns_id_vec_len - 1); clib_memcpy (vcm->cfg.namespace_id, env_var_str, ns_id_vec_len); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured namespace_id (%v) from " - VPPCOM_ENV_APP_NAMESPACE_ID - "!", getpid (), vcm->cfg.namespace_id); + VDBG (0, "VCL<%d>: configured namespace_id (%v) from " + VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (), + vcm->cfg.namespace_id); } env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET); if (env_var_str) @@ -2235,46 +1896,38 @@ vppcom_app_create (char *app_name) else { vcm->cfg.namespace_secret = tmp; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured namespace secret " - "(%lu) from " - VPPCOM_ENV_APP_NAMESPACE_SECRET - "!", getpid (), vcm->cfg.namespace_secret); + VDBG (0, "VCL<%d>: configured namespace secret (%lu) from " + VPPCOM_ENV_APP_NAMESPACE_SECRET "!", getpid (), + vcm->cfg.namespace_secret); } } if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP)) { vcm->cfg.app_proxy_transport_tcp = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_proxy_transport_tcp " - "(%u) from " - VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP - "!", getpid (), vcm->cfg.app_proxy_transport_tcp); + VDBG (0, "VCL<%d>: configured app_proxy_transport_tcp (%u) from " + VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP "!", getpid (), + vcm->cfg.app_proxy_transport_tcp); } if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP)) { vcm->cfg.app_proxy_transport_udp = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_proxy_transport_udp " - "(%u) from " - VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP - "!", getpid (), vcm->cfg.app_proxy_transport_udp); + VDBG (0, "VCL<%d>: configured app_proxy_transport_udp (%u) from " + VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP "!", getpid (), + vcm->cfg.app_proxy_transport_udp); } if (getenv (VPPCOM_ENV_APP_SCOPE_LOCAL)) { vcm->cfg.app_scope_local = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_scope_local (%u) from " - VPPCOM_ENV_APP_SCOPE_LOCAL - "!", getpid (), vcm->cfg.app_scope_local); + VDBG (0, "VCL<%d>: configured app_scope_local (%u) from " + VPPCOM_ENV_APP_SCOPE_LOCAL "!", getpid (), + vcm->cfg.app_scope_local); } if (getenv (VPPCOM_ENV_APP_SCOPE_GLOBAL)) { vcm->cfg.app_scope_global = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_scope_global (%u) from " - VPPCOM_ENV_APP_SCOPE_GLOBAL - "!", getpid (), vcm->cfg.app_scope_global); + VDBG (0, "VCL<%d>: configured app_scope_global (%u) from " + VPPCOM_ENV_APP_SCOPE_GLOBAL "!", getpid (), + vcm->cfg.app_scope_global); } vcm->main_cpu = os_get_thread_index (); @@ -2298,6 +1951,7 @@ vppcom_app_create (char *app_name) /* API hookup and connect to VPP */ vppcom_api_hookup (); + vcl_elog_init (vcm); vcm->app_state = STATE_APP_START; rv = vppcom_connect_to_vpp (app_name); if (rv) @@ -2311,9 +1965,7 @@ vppcom_app_create (char *app_name) rv = vce_start_event_thread (&(vcm->event_thread), 20); - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: sending session enable", getpid ()); + VDBG (0, "VCL<%d>: sending session enable", getpid ()); rv = vppcom_app_session_enable (); if (rv) @@ -2323,8 +1975,7 @@ vppcom_app_create (char *app_name) return rv; } - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: sending app attach", getpid ()); + VDBG (0, "VCL<%d>: sending app attach", getpid ()); rv = vppcom_app_attach (); if (rv) @@ -2334,10 +1985,8 @@ vppcom_app_create (char *app_name) return rv; } - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: app_name '%s', my_client_index %d (0x%x)", - getpid (), app_name, vcm->my_client_index, - vcm->my_client_index); + VDBG (0, "VCL<%d>: app_name '%s', my_client_index %d (0x%x)", + getpid (), app_name, vcm->my_client_index, vcm->my_client_index); } return VPPCOM_OK; @@ -2347,46 +1996,25 @@ void vppcom_app_destroy (void) { int rv; + f64 orig_app_timeout; if (vcm->my_client_index == ~0) return; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: detaching from VPP, my_client_index %d (0x%x)", - getpid (), vcm->my_client_index, vcm->my_client_index); - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "app_detach:C:%d", - .format_args = "i4", - }; - - struct - { - u32 data; - } *ed; - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); - ed->data = vcm->my_client_index; - /* *INDENT-ON* */ - } + VDBG (0, "VCL<%d>: detaching from VPP, my_client_index %d (0x%x)", + getpid (), vcm->my_client_index, vcm->my_client_index); + vcl_evt (VCL_EVT_DETACH, vcm); vppcom_app_detach (); + orig_app_timeout = vcm->cfg.app_timeout; + vcm->cfg.app_timeout = 2.0; rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); + vcm->cfg.app_timeout = orig_app_timeout; if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: application detach timed out! " - "returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); - } - - /* Finished with logging before client gets reset to ~0 */ - if (VPPCOM_DEBUG > 0) - write_elog (); + VDBG (0, "VCL<%d>: application detach timed out! returning %d (%s)", + getpid (), rv, vppcom_retval_str (rv)); + vcl_elog_stop (vcm); vl_client_disconnect_from_vlib (); vcm->my_client_index = ~0; vcm->app_state = STATE_APP_START; @@ -2395,19 +2023,16 @@ vppcom_app_destroy (void) int vppcom_session_create (u8 proto, u8 is_nonblocking) { - session_t *session; + vcl_session_t *session; u32 session_index; - session_state_t state; - elog_track_t session_elog_track; - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); pool_get (vcm->sessions, session); memset (session, 0, sizeof (*session)); session_index = session - vcm->sessions; - session->proto = proto; - session->state = STATE_START; - state = session->state; + session->session_type = proto; + session->session_state = STATE_START; session->vpp_handle = ~0; if (is_nonblocking) @@ -2415,40 +2040,12 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); - if (VPPCOM_DEBUG > 0) - { - session->elog_track.name = - (char *) format (0, "C:%d:S:%d%c", vcm->my_client_index, - session_index, 0); - elog_track_register (&vcm->elog_main, &session->elog_track); - session_elog_track = session->elog_track; - } - - clib_spinlock_unlock (&vcm->sessions_lockp); + vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state, + is_nonblocking, session_index); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: sid %u", getpid (), session_index); + VCL_SESSION_UNLOCK (); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "session_create:proto:%d state:%d is_nonblocking:%d", - .format_args = "i4i4i4", - }; - - struct - { - u32 data[3]; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - ed->data[0] = proto; - ed->data[1] = state; - ed->data[2] = is_nonblocking; - /* *INDENT-ON* */ - } + VDBG (0, "VCL<%d>: sid %u", getpid (), session_index); return (int) session_index; } @@ -2456,7 +2053,7 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) int vppcom_session_close (uint32_t session_index) { - session_t *session = 0; + vcl_session_t *session = 0; int rv; u8 is_vep; u8 is_vep_session; @@ -2465,29 +2062,15 @@ vppcom_session_close (uint32_t session_index) u64 vpp_handle; uword *p; session_state_t state; - elog_track_t session_elog_track; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); is_vep = session->is_vep; is_vep_session = session->is_vep_session; next_sid = session->vep.next_sid; vep_idx = session->vep.vep_idx; - state = session->state; + state = session->session_state; vpp_handle = session->vpp_handle; - clib_spinlock_unlock (&vcm->sessions_lockp); - - /* - * Why two if(VPPCOM_DEBUG) checks? - * - * Eventually all clib_warnings need their own way of being - * logged and signalled (like severity) where event logging - * is a separate debugging tool. It will make the separation - * easier. ... parting is such sweet sorrow ... - */ - if (VPPCOM_DEBUG > 0) - { - session_elog_track = session->elog_track; - } + VCL_SESSION_UNLOCK (); if (VPPCOM_DEBUG > 0) { @@ -2506,15 +2089,15 @@ vppcom_session_close (uint32_t session_index) while (next_sid != ~0) { rv = vppcom_epoll_ctl (session_index, EPOLL_CTL_DEL, next_sid, 0); - if ((VPPCOM_DEBUG > 0) && PREDICT_FALSE (rv < 0)) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "EPOLL_CTL_DEL vep_idx %u failed! rv %d (%s)", - getpid (), vpp_handle, next_sid, vep_idx, - rv, vppcom_retval_str (rv)); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL " + "vep_idx %u failed! rv %d (%s)", + getpid (), vpp_handle, next_sid, vep_idx, + rv, vppcom_retval_str (rv)); - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); next_sid = session->vep.next_sid; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } } else @@ -2522,24 +2105,21 @@ vppcom_session_close (uint32_t session_index) if (is_vep_session) { rv = vppcom_epoll_ctl (vep_idx, EPOLL_CTL_DEL, session_index, 0); - if ((VPPCOM_DEBUG > 0) && (rv < 0)) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "EPOLL_CTL_DEL vep_idx %u failed! rv %d (%s)", - getpid (), vpp_handle, session_index, - vep_idx, rv, vppcom_retval_str (rv)); + if (rv < 0) + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL " + "vep_idx %u failed! rv %d (%s)", + getpid (), vpp_handle, session_index, + vep_idx, rv, vppcom_retval_str (rv)); } if (state & STATE_LISTEN) { rv = vppcom_session_unbind (session_index); if (PREDICT_FALSE (rv < 0)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "listener unbind failed! rv %d (%s)", - getpid (), vpp_handle, session_index, - rv, vppcom_retval_str (rv)); - } + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: listener unbind " + "failed! rv %d (%s)", + getpid (), vpp_handle, session_index, + rv, vppcom_retval_str (rv)); } else if (state & (CLIENT_STATE_OPEN | SERVER_STATE_OPEN)) @@ -2553,7 +2133,7 @@ vppcom_session_close (uint32_t session_index) } } - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); vpp_handle = session->vpp_handle; if (vpp_handle != ~0) { @@ -2563,7 +2143,7 @@ vppcom_session_close (uint32_t session_index) } pool_put_index (vcm->sessions, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); if (VPPCOM_DEBUG > 0) { @@ -2576,24 +2156,7 @@ vppcom_session_close (uint32_t session_index) } done: - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "session_close:rv:%d", - .format_args = "i4", - }; - - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - ed->data = rv; - /* *INDENT-ON* */ - } + vcl_evt (VCL_EVT_CLOSE, session, rv); return rv; } @@ -2601,67 +2164,37 @@ done: int vppcom_session_bind (uint32_t session_index, vppcom_endpt_t * ep) { - session_t *session = 0; + vcl_session_t *session = 0; int rv; if (!ep || !ep->ip) return VPPCOM_EINVAL; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); if (session->is_vep) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); clib_warning ("VCL<%d>: ERROR: sid %u: cannot " "bind to an epoll session!", getpid (), session_index); rv = VPPCOM_EBADFD; goto done; } - session->lcl_addr.is_ip4 = ep->is_ip4; - session->lcl_addr.ip46 = to_ip46 (!ep->is_ip4, ep->ip); - session->lcl_port = ep->port; - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: sid %u: binding to local %s address %U " - "port %u, proto %s", getpid (), session_index, - session->lcl_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, &session->lcl_addr.ip46, - session->lcl_addr.is_ip4, - clib_net_to_host_u16 (session->lcl_port), - session->proto ? "UDP" : "TCP"); - - if (VPPCOM_DEBUG > 0) - { - if (session->lcl_addr.is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "bind local:%s:%d.%d.%d.%d:%d ", - .format_args = "t1i1i1i1i1i2", - .n_enum_strings = 2, - .enum_strings = {"TCP", "UDP",}, - }; - - CLIB_PACKED (struct { - u8 proto; - u8 addr[4]; - u16 port; - }) *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->proto = session->proto; - ed->addr[0] = session->lcl_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->lcl_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->lcl_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->lcl_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->lcl_port); - /* *INDENT-ON* */ - } - } - - clib_spinlock_unlock (&vcm->sessions_lockp); + session->transport.is_ip4 = ep->is_ip4; + session->transport.lcl_ip = to_ip46 (ep->is_ip4 ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, ep->ip); + session->transport.lcl_port = ep->port; + + VDBG (0, "VCL<%d>: sid %u: binding to local %s address %U port %u, " + "proto %s", getpid (), session_index, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &session->transport.lcl_ip, + session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.lcl_port), + session->session_type ? "UDP" : "TCP"); + vcl_evt (VCL_EVT_BIND, session); + VCL_SESSION_UNLOCK (); done: return rv; } @@ -2669,18 +2202,18 @@ done: int vppcom_session_listen (uint32_t listen_session_index, uint32_t q_len) { - session_t *listen_session = 0; + vcl_session_t *listen_session = 0; u64 listen_vpp_handle; int rv, retval; if (q_len == 0 || q_len == ~0) q_len = vcm->cfg.listen_queue_size; - VCL_LOCK_AND_GET_SESSION (listen_session_index, &listen_session); + VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); if (listen_session->is_vep) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); clib_warning ("VCL<%d>: ERROR: sid %u: cannot listen on an " "epoll session!", getpid (), listen_session_index); rv = VPPCOM_EBADFD; @@ -2688,104 +2221,65 @@ vppcom_session_listen (uint32_t listen_session_index, uint32_t q_len) } listen_vpp_handle = listen_session->vpp_handle; - if (listen_session->state & STATE_LISTEN) + if (listen_session->session_state & STATE_LISTEN) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "already in listen state!", - getpid (), listen_vpp_handle, listen_session_index); + VCL_SESSION_UNLOCK (); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: already in listen state!", + getpid (), listen_vpp_handle, listen_session_index); rv = VPPCOM_OK; goto done; } - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, " - "sid %u: sending bind request...", - getpid (), listen_vpp_handle, listen_session_index); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: sending VPP bind+listen " + "request...", getpid (), listen_vpp_handle, listen_session_index); vppcom_send_bind_sock (listen_session, listen_session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); retval = vppcom_wait_for_session_state_change (listen_session_index, STATE_LISTEN, vcm->cfg.session_timeout); - VCL_LOCK_AND_GET_SESSION (listen_session_index, &listen_session); + VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); if (PREDICT_FALSE (retval)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: bind failed! " - "returning %d (%s)", getpid (), - listen_session->vpp_handle, listen_session_index, - retval, vppcom_retval_str (retval)); - clib_spinlock_unlock (&vcm->sessions_lockp); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: bind+listen failed! " + "returning %d (%s)", getpid (), listen_session->vpp_handle, + listen_session_index, retval, vppcom_retval_str (retval)); + VCL_SESSION_UNLOCK (); rv = retval; goto done; } - clib_spinlock_lock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_LOCK (); clib_fifo_validate (vcm->client_session_index_fifo, q_len); - clib_spinlock_unlock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_UNLOCK (); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); done: return rv; } int -vppcom_session_register_listener (uint32_t session_index, - vppcom_session_listener_cb cb, - vppcom_session_listener_errcb - errcb, uint8_t flags, int q_len, void *ptr) +validate_args_session_accept_ (vcl_session_t * listen_session) { - int rv = VPPCOM_OK; - vce_event_key_t evk; - vppcom_session_listener_t *listener_args; + u32 listen_session_index = listen_session - vcm->sessions; - rv = vppcom_session_listen (session_index, q_len); - if (rv) + /* Input validation - expects spinlock on sessions_lockp */ + if (listen_session->is_vep) { - goto done; + clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an " + "epoll session!", getpid (), listen_session_index); + return VPPCOM_EBADFD; } - - /* Register handler for connect_request event on listen_session_index */ - listener_args = clib_mem_alloc (sizeof (vppcom_session_listener_t)); - listener_args->user_cb = cb; - listener_args->user_cb_data = ptr; - listener_args->user_errcb = errcb; - - evk.session_index = session_index; - evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; - (void) vce_register_handler (&vcm->event_thread, &evk, - vce_registered_listener_connect_handler_fn, - listener_args); - -done: - return rv; -} - -int -validate_args_session_accept_ (session_t * listen_session) -{ - u32 listen_session_index = listen_session - vcm->sessions; - - /* Input validation - expects spinlock on sessions_lockp */ - if (listen_session->is_vep) - { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an " - "epoll session!", getpid (), listen_session_index); - return VPPCOM_EBADFD; - } - - if (listen_session->state != STATE_LISTEN) + if (listen_session->session_state != STATE_LISTEN) { clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "not in listen state! state 0x%x (%s)", getpid (), listen_session->vpp_handle, listen_session_index, - listen_session->state, - vppcom_session_state_str (listen_session->state)); + listen_session->session_state, + vppcom_session_state_str (listen_session->session_state)); return VPPCOM_EBADFD; } return VPPCOM_OK; @@ -2795,8 +2289,8 @@ int vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, uint32_t flags) { - session_t *listen_session = 0; - session_t *client_session = 0; + vcl_session_t *listen_session = 0; + vcl_session_t *client_session = 0; u32 client_session_index = ~0; int rv; u64 listen_vpp_handle; @@ -2808,13 +2302,13 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, int millisecond_timeout = 1; int hours_timeout = 20 * 60 * 60; - VCL_LOCK_AND_GET_SESSION (listen_session_index, &listen_session); + VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); listen_vpp_handle = listen_session->vpp_handle; // For debugging rv = validate_args_session_accept_ (listen_session); if (rv) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); goto done; } @@ -2830,7 +2324,7 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, VCL_SESS_ATTR_NONBLOCK))) ts.tv_sec += hours_timeout; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); /* Register handler for connect_request event on listen_session_index */ vce_event_key_t evk; @@ -2838,26 +2332,28 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; reg = vce_register_handler (&vcm->event_thread, &evk, vce_connect_request_handler_fn, 0); + VCL_EVENTS_LOCK (); ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); pthread_mutex_lock (®->handler_lock); while (!ev) { - rv = - pthread_cond_timedwait (®->handler_cond, ®->handler_lock, &ts); + VCL_EVENTS_UNLOCK (); + rv = pthread_cond_timedwait (®->handler_cond, + ®->handler_lock, &ts); if (rv == ETIMEDOUT) { rv = VPPCOM_EAGAIN; goto cleanup; } + VCL_EVENTS_LOCK (); ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); } - result = (vce_event_connect_request_t *) ev->data; + result = vce_get_event_data (ev, sizeof (*result)); client_session_index = result->accepted_session_index; - - + VCL_EVENTS_UNLOCK (); /* Remove from the FIFO used to service epoll */ - clib_spinlock_lock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_LOCK (); if (clib_fifo_elts (vcm->client_session_index_fifo)) { u32 tmp_client_session_index; @@ -2868,9 +2364,9 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, clib_fifo_add1 (vcm->client_session_index_fifo, tmp_client_session_index); } - clib_spinlock_unlock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_UNLOCK (); - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); rv = vppcom_session_at_index (client_session_index, &client_session); if (PREDICT_FALSE (rv)) @@ -2888,23 +2384,22 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, else VCL_SESS_ATTR_CLR (client_session->attr, VCL_SESS_ATTR_NONBLOCK); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: Got a client request! " - "vpp handle 0x%llx, sid %u, flags %d, is_nonblocking %u", - getpid (), listen_vpp_handle, listen_session_index, - client_session->vpp_handle, client_session_index, - flags, VCL_SESS_ATTR_TEST (client_session->attr, - VCL_SESS_ATTR_NONBLOCK)); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: Got a client request! " + "vpp handle 0x%llx, sid %u, flags %d, is_nonblocking %u", + getpid (), listen_vpp_handle, listen_session_index, + client_session->vpp_handle, client_session_index, + flags, VCL_SESS_ATTR_TEST (client_session->attr, + VCL_SESS_ATTR_NONBLOCK)); if (ep) { - ep->is_ip4 = client_session->peer_addr.is_ip4; - ep->port = client_session->peer_port; - if (client_session->peer_addr.is_ip4) - clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip4, + ep->is_ip4 = client_session->transport.is_ip4; + ep->port = client_session->transport.rmt_port; + if (client_session->transport.is_ip4) + clib_memcpy (ep->ip, &client_session->transport.rmt_ip.ip4, sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip6, + clib_memcpy (ep->ip, &client_session->transport.rmt_ip.ip6, sizeof (ip6_address_t)); } @@ -2912,74 +2407,38 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, client_session->client_context, 0 /* retval OK */ ); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle " - "0x%llx, sid %u connection to local %s address " - "%U port %u", getpid (), listen_vpp_handle, - listen_session_index, client_session->vpp_handle, - client_session_index, - client_session->lcl_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, &client_session->lcl_addr.ip46, - client_session->lcl_addr.is_ip4, - clib_net_to_host_u16 (client_session->lcl_port)); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle 0x%llx," + " sid %u connection from peer %s address %U port %u to local %s address" + " %U port %u", + getpid (), listen_vpp_handle, + listen_session_index, client_session->vpp_handle, + client_session_index, + client_session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &client_session->transport.rmt_ip, + client_session->transport.is_ip4 ? + IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (client_session->transport.rmt_port), + client_session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &client_session->transport.lcl_ip, + client_session->transport.is_ip4 ? + IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (client_session->transport.lcl_port)); + vcl_evt (VCL_EVT_ACCEPT, client_session, listen_session, + client_session_index); + VCL_SESSION_UNLOCK (); - if (VPPCOM_DEBUG > 0) + rv = (int) client_session_index; + vce_clear_event (&vcm->event_thread, reg->ev_idx); + if (vcm->session_io_thread.io_sessions_lockp) { - client_session->elog_track.name = - (char *) format (0, "C:%d:S:%d%c", vcm->my_client_index, - client_session_index, 0); - elog_track_register (&vcm->elog_main, &client_session->elog_track); - - // Two elog entries due to 20-byte per entry constraint. - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "accept: listen_handle:%x from_handle:%x", - .format_args = "i8i8", - }; - - struct - { - u64 handle[2]; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, client_session->elog_track); - ed->handle[0] = listen_vpp_handle; - ed->handle[1] = client_session->vpp_handle; - /* *INDENT-ON* */ - - if (client_session->lcl_addr.is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e2) = - { - .format = "accept: S:%d %d.%d.%d.%d:%d ", - .format_args = "i4i1i1i1i1i2", - }; - - CLIB_PACKED (struct { - u32 session; - u8 addr[4]; - u16 port; - }) *ed2; - - ed2 = - ELOG_TRACK_DATA (&vcm->elog_main, e2, client_session->elog_track); - ed2->session = client_session_index; - ed2->addr[0] = client_session->lcl_addr.ip46.ip4.as_u8[0]; - ed2->addr[1] = client_session->lcl_addr.ip46.ip4.as_u8[1]; - ed2->addr[2] = client_session->lcl_addr.ip46.ip4.as_u8[2]; - ed2->addr[3] = client_session->lcl_addr.ip46.ip4.as_u8[3]; - ed2->port = clib_net_to_host_u16 (client_session->lcl_port); - /* *INDENT-ON* */ - } + /* Throw this new accepted session index into the rx poll thread pool */ + VCL_IO_SESSIONS_LOCK (); + u32 *active_session_index; + pool_get (vcm->session_io_thread.active_session_indexes, + active_session_index); + *active_session_index = client_session_index; + VCL_IO_SESSIONS_UNLOCK (); } - - clib_spinlock_unlock (&vcm->sessions_lockp); - - rv = (int) client_session_index; - vce_clear_event (&vcm->event_thread, ev); - cleanup: vce_unregister_handler (&vcm->event_thread, reg); pthread_mutex_unlock (®->handler_lock); @@ -2991,62 +2450,67 @@ done: int vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep) { - session_t *session = 0; + vcl_session_t *session = 0; u64 vpp_handle = 0; int rv, retval = VPPCOM_OK; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); if (PREDICT_FALSE (session->is_vep)) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); clib_warning ("VCL<%d>: ERROR: sid %u: cannot " "connect on an epoll session!", getpid (), session_index); rv = VPPCOM_EBADFD; goto done; } - if (PREDICT_FALSE (session->state & CLIENT_STATE_OPEN)) + if (PREDICT_FALSE (session->session_state & CLIENT_STATE_OPEN)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session already " - "connected to %s %U port %d proto %s, state 0x%x (%s)", - getpid (), session->vpp_handle, session_index, - session->peer_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, - &session->peer_addr.ip46, session->peer_addr.is_ip4, - clib_net_to_host_u16 (session->peer_port), - session->proto ? "UDP" : "TCP", session->state, - vppcom_session_state_str (session->state)); - - clib_spinlock_unlock (&vcm->sessions_lockp); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: session already " + "connected to %s %U port %d proto %s, state 0x%x (%s)", + getpid (), session->vpp_handle, session_index, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, + &session->transport.rmt_ip, session->transport.is_ip4 ? + IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.rmt_port), + session->session_type ? "UDP" : "TCP", session->session_state, + vppcom_session_state_str (session->session_state)); + + VCL_SESSION_UNLOCK (); goto done; } - session->peer_addr.is_ip4 = server_ep->is_ip4; - session->peer_addr.ip46 = to_ip46 (!server_ep->is_ip4, server_ep->ip); - session->peer_port = server_ep->port; - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connecting to server " - "%s %U port %d proto %s", - getpid (), session->vpp_handle, session_index, - session->peer_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, - &session->peer_addr.ip46, session->peer_addr.is_ip4, - clib_net_to_host_u16 (session->peer_port), - session->proto ? "UDP" : "TCP"); + session->transport.is_ip4 = server_ep->is_ip4; + if (session->transport.is_ip4) + clib_memcpy (&session->transport.rmt_ip.ip4, server_ep->ip, + sizeof (ip4_address_t)); + else + clib_memcpy (&session->transport.rmt_ip.ip6, server_ep->ip, + sizeof (ip6_address_t)); + session->transport.rmt_port = server_ep->port; + + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connecting to server %s %U " + "port %d proto %s", + getpid (), session->vpp_handle, session_index, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, + &session->transport.rmt_ip, session->transport.is_ip4 ? + IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.rmt_port), + session->session_type ? "UDP" : "TCP"); vppcom_send_connect_sock (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); retval = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, vcm->cfg.session_timeout); - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); vpp_handle = session->vpp_handle; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); done: if (PREDICT_FALSE (retval)) @@ -3055,19 +2519,18 @@ done: if (VPPCOM_DEBUG > 0) { if (session) - clib_warning - ("VCL<%d>: vpp handle 0x%llx, sid %u: connect failed! " - "returning %d (%s)", getpid (), vpp_handle, - session_index, rv, vppcom_retval_str (rv)); + clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connect " + "failed! returning %d (%s)", getpid (), vpp_handle, + session_index, rv, vppcom_retval_str (rv)); else clib_warning ("VCL<%d>: no session for sid %u: connect failed! " "returning %d (%s)", getpid (), session_index, rv, vppcom_retval_str (rv)); } } - else if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connected!", - getpid (), vpp_handle, session_index); + else + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connected!", + getpid (), vpp_handle, session_index); return rv; } @@ -3076,7 +2539,7 @@ static inline int vppcom_session_read_internal (uint32_t session_index, void *buf, int n, u8 peek) { - session_t *session = 0; + vcl_session_t *session = 0; svm_fifo_t *rx_fifo; int n_read = 0; int rv; @@ -3088,16 +2551,16 @@ vppcom_session_read_internal (uint32_t session_index, void *buf, int n, ASSERT (buf); - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); is_nonblocking = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); rx_fifo = session->rx_fifo; - state = session->state; + state = session->session_state; vpp_handle = session->vpp_handle; if (PREDICT_FALSE (session->is_vep)) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); clib_warning ("VCL<%d>: ERROR: sid %u: cannot " "read from an epoll session!", getpid (), session_index); rv = VPPCOM_EBADFD; @@ -3106,19 +2569,17 @@ vppcom_session_read_internal (uint32_t session_index, void *buf, int n, if (PREDICT_FALSE (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: %s session is " - "not open! state 0x%x (%s), returning %d (%s)", - getpid (), vpp_handle, session_index, state, - vppcom_session_state_str (state), - rv, vppcom_retval_str (rv)); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: %s session is not open! " + "state 0x%x (%s), returning %d (%s)", + getpid (), vpp_handle, session_index, state, + vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); goto done; } - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); do { @@ -3131,7 +2592,7 @@ vppcom_session_read_internal (uint32_t session_index, void *buf, int n, if (n_read <= 0) { - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); poll_et = (((EPOLLET | EPOLLIN) & session->vep.ev.events) == (EPOLLET | EPOLLIN)); @@ -3142,24 +2603,21 @@ vppcom_session_read_internal (uint32_t session_index, void *buf, int n, { rv = VPPCOM_ECONNRESET; - if (VPPCOM_DEBUG > 1) - { - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo " - "with session state 0x%x (%s)!" - " Setting state to 0x%x (%s), returning %d (%s)", - getpid (), session->vpp_handle, session_index, - state, vppcom_session_state_str (state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - } + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " + "session state 0x%x (%s)! Setting state to 0x%x (%s), " + "returning %d (%s)", + getpid (), session->vpp_handle, session_index, + state, vppcom_session_state_str (state), + STATE_DISCONNECT, + vppcom_session_state_str (STATE_DISCONNECT), rv, + vppcom_retval_str (rv)); - session->state = STATE_DISCONNECT; + session->session_state = STATE_DISCONNECT; } else rv = VPPCOM_EAGAIN; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } else rv = n_read; @@ -3192,12 +2650,12 @@ vppcom_session_peek (uint32_t session_index, void *buf, int n) } static inline int -vppcom_session_read_ready (session_t * session, u32 session_index) +vppcom_session_read_ready (vcl_session_t * session, u32 session_index) { int ready = 0; u32 poll_et; int rv; - session_state_t state = session->state; + session_state_t state = session->session_state; u64 vpp_handle = session->vpp_handle; /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ @@ -3209,11 +2667,11 @@ vppcom_session_read_ready (session_t * session, u32 session_index) goto done; } - if (session->state & STATE_LISTEN) + if (session->session_state & STATE_LISTEN) { - clib_spinlock_lock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_LOCK (); ready = clib_fifo_elts (vcm->client_session_index_fifo); - clib_spinlock_unlock (&vcm->session_fifo_lockp); + VCL_ACCEPT_FIFO_UNLOCK (); } else { @@ -3222,12 +2680,11 @@ vppcom_session_read_ready (session_t * session, u32 session_index) rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session is " - "not open! state 0x%x (%s), returning %d (%s)", - getpid (), vpp_handle, session_index, - state, vppcom_session_state_str (state), - rv, vppcom_retval_str (rv)); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open!" + " state 0x%x (%s), returning %d (%s)", + getpid (), vpp_handle, session_index, + state, vppcom_session_state_str (state), + rv, vppcom_retval_str (rv)); goto done; } @@ -3245,19 +2702,15 @@ vppcom_session_read_ready (session_t * session, u32 session_index) { rv = VPPCOM_ECONNRESET; - if (VPPCOM_DEBUG > 1) - { - clib_warning ("VCL<%d>: vpp handle 0x%llx, " - "sid %u: Empty fifo with" - " session state 0x%x (%s)! Setting state to " - "0x%x (%s), returning %d (%s)", - getpid (), session_index, vpp_handle, - state, vppcom_session_state_str (state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - } - session->state = STATE_DISCONNECT; + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " + "session state 0x%x (%s)! Setting state to 0x%x (%s), " + "returning %d (%s)", + getpid (), session_index, vpp_handle, + state, vppcom_session_state_str (state), + STATE_DISCONNECT, + vppcom_session_state_str (STATE_DISCONNECT), rv, + vppcom_retval_str (rv)); + session->session_state = STATE_DISCONNECT; goto done; } } @@ -3281,7 +2734,7 @@ done: int vppcom_session_write (uint32_t session_index, void *buf, size_t n) { - session_t *session = 0; + vcl_session_t *session = 0; svm_fifo_t *tx_fifo = 0; svm_queue_t *q; session_fifo_event_t evt; @@ -3292,16 +2745,16 @@ vppcom_session_write (uint32_t session_index, void *buf, size_t n) ASSERT (buf); - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); tx_fifo = session->tx_fifo; is_nonblocking = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); vpp_handle = session->vpp_handle; - state = session->state; + state = session->session_state; if (PREDICT_FALSE (session->is_vep)) { - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "cannot write to an epoll session!", getpid (), vpp_handle, session_index); @@ -3310,22 +2763,21 @@ vppcom_session_write (uint32_t session_index, void *buf, size_t n) goto done; } - if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) + if (!(session->session_state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) { rv = - ((session->state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : + ((session->session_state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "session is not open! state 0x%x (%s)", - getpid (), vpp_handle, session_index, - state, vppcom_session_state_str (state)); + VCL_SESSION_UNLOCK (); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open! " + "state 0x%x (%s)", + getpid (), vpp_handle, session_index, + state, vppcom_session_state_str (state)); goto done; } - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); do { @@ -3333,57 +2785,57 @@ vppcom_session_write (uint32_t session_index, void *buf, size_t n) } while (!is_nonblocking && (n_write <= 0)); - /* If event wasn't set, add one */ + /* If event wasn't set, add one + * + * To reduce context switching, can check if an + * event is already there for this event_key, but for now + * this will suffice. */ + if ((n_write > 0) && svm_fifo_set_event (tx_fifo)) { /* Fabricate TX event, send to vpp */ evt.fifo = tx_fifo; evt.event_type = FIFO_EVENT_APP_TX; - VCL_LOCK_AND_GET_SESSION (session_index, &session); - q = session->vpp_event_queue; + VCL_SESSION_LOCK_AND_GET (session_index, &session); + q = session->vpp_evt_q; ASSERT (q); svm_queue_add (q, (u8 *) & evt, 0 /* do wait for mutex */ ); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "added FIFO_EVENT_APP_TX to " - "vpp_event_q %p, n_write %d", getpid (), - vpp_handle, session_index, q, n_write); + VCL_SESSION_UNLOCK (); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: added FIFO_EVENT_APP_TX " + "to vpp_event_q %p, n_write %d", getpid (), + vpp_handle, session_index, q, n_write); } if (n_write <= 0) { - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); poll_et = (((EPOLLET | EPOLLOUT) & session->vep.ev.events) == (EPOLLET | EPOLLOUT)); if (poll_et) session->vep.et_mask |= EPOLLOUT; - if (session->state & STATE_CLOSE_ON_EMPTY) + if (session->session_state & STATE_CLOSE_ON_EMPTY) { rv = VPPCOM_ECONNRESET; - if (VPPCOM_DEBUG > 1) - { - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "Empty fifo with session state 0x%x (%s)!" - " Setting state to 0x%x (%s), returning %d (%s)", - getpid (), session->vpp_handle, session_index, - session->state, - vppcom_session_state_str (session->state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - } - - session->state = STATE_DISCONNECT; + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " + "session state 0x%x (%s)! Setting state to 0x%x (%s), " + "returning %d (%s)", + getpid (), session->vpp_handle, session_index, + session->session_state, + vppcom_session_state_str (session->session_state), + STATE_DISCONNECT, + vppcom_session_state_str (STATE_DISCONNECT), rv, + vppcom_retval_str (rv)); + + session->session_state = STATE_DISCONNECT; } else rv = VPPCOM_EAGAIN; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } else rv = n_write; @@ -3404,7 +2856,7 @@ done: } static inline int -vppcom_session_write_ready (session_t * session, u32 session_index) +vppcom_session_write_ready (vcl_session_t * session, u32 session_index) { int ready; u32 poll_et; @@ -3422,7 +2874,7 @@ vppcom_session_write_ready (session_t * session, u32 session_index) goto done; } - if (PREDICT_FALSE (session->state & STATE_LISTEN)) + if (PREDICT_FALSE (session->session_state & STATE_LISTEN)) { clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "cannot write to a listen session!", @@ -3431,9 +2883,9 @@ vppcom_session_write_ready (session_t * session, u32 session_index) goto done; } - if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) + if (!(session->session_state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) { - session_state_t state = session->state; + session_state_t state = session->session_state; rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); @@ -3448,11 +2900,9 @@ vppcom_session_write_ready (session_t * session, u32 session_index) ready = svm_fifo_max_enqueue (session->tx_fifo); - if (VPPCOM_DEBUG > 3) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "peek %s (%p), ready = %d", getpid (), - session->vpp_handle, session_index, - session->tx_fifo, ready); + VDBG (3, "VCL<%d>: vpp handle 0x%llx, sid %u: peek %s (%p), ready = %d", + getpid (), session->vpp_handle, session_index, session->tx_fifo, + ready); if (ready == 0) { @@ -3461,24 +2911,20 @@ vppcom_session_write_ready (session_t * session, u32 session_index) if (poll_et) session->vep.et_mask |= EPOLLOUT; - if (session->state & STATE_CLOSE_ON_EMPTY) + if (session->session_state & STATE_CLOSE_ON_EMPTY) { rv = VPPCOM_ECONNRESET; - if (VPPCOM_DEBUG > 1) - { - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "Empty fifo with session " - "state 0x%x (%s)! Setting state to 0x%x (%s), " - "returning %d (%s)", getpid (), - session->vpp_handle, session_index, - session->state, - vppcom_session_state_str (session->state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - } - session->state = STATE_DISCONNECT; + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " + "session state 0x%x (%s)! Setting state to 0x%x (%s), " + "returning %d (%s)", getpid (), + session->vpp_handle, session_index, + session->session_state, + vppcom_session_state_str (session->session_state), + STATE_DISCONNECT, + vppcom_session_state_str (STATE_DISCONNECT), rv, + vppcom_retval_str (rv)); + session->session_state = STATE_DISCONNECT; goto done; } } @@ -3493,7 +2939,7 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, double time_to_wait) { u32 session_index; - session_t *session = 0; + vcl_session_t *session = 0; int rv, bits_set = 0; f64 timeout = clib_time_now (&vcm->clib_time) + time_to_wait; u32 minbits = clib_max (n_bits, BITS (uword)); @@ -3533,19 +2979,18 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, { clib_bitmap_foreach (session_index, vcm->rd_bitmap, ({ - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK(); rv = vppcom_session_at_index (session_index, &session); if (rv < 0) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: session %d specified in " - "read_map is closed.", getpid (), + VCL_SESSION_UNLOCK(); + VDBG (1, "VCL<%d>: session %d specified in read_map is" + " closed.", getpid (), session_index); bits_set = VPPCOM_EBADFD; goto select_done; } - if (session->state & STATE_LISTEN) + if (session->session_state & STATE_LISTEN) { vce_event_handler_reg_t *reg = 0; vce_event_key_t evk; @@ -3570,7 +3015,7 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, } else rv = vppcom_session_read_ready (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK(); if (except_map && vcm->ex_bitmap && clib_bitmap_get (vcm->ex_bitmap, session_index) && (rv < 0)) @@ -3590,13 +3035,12 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, { clib_bitmap_foreach (session_index, vcm->wr_bitmap, ({ - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK(); rv = vppcom_session_at_index (session_index, &session); if (rv < 0) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: session %d specified in " + VCL_SESSION_UNLOCK(); + VDBG (0, "VCL<%d>: session %d specified in " "write_map is closed.", getpid (), session_index); bits_set = VPPCOM_EBADFD; @@ -3604,7 +3048,7 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, } rv = vppcom_session_write_ready (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK(); if (write_map && (rv > 0)) { clib_bitmap_set_no_check (write_map, session_index, 1); @@ -3617,21 +3061,20 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, { clib_bitmap_foreach (session_index, vcm->ex_bitmap, ({ - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK(); rv = vppcom_session_at_index (session_index, &session); if (rv < 0) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: session %d specified in " - "except_map is closed.", getpid (), + VCL_SESSION_UNLOCK(); + VDBG (1, "VCL<%d>: session %d specified in except_map " + "is closed.", getpid (), session_index); bits_set = VPPCOM_EBADFD; goto select_done; } rv = vppcom_session_read_ready (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK(); if (rv < 0) { clib_bitmap_set_no_check (except_map, session_index, 1); @@ -3651,7 +3094,7 @@ select_done: static inline void vep_verify_epoll_chain (u32 vep_idx) { - session_t *session; + vcl_session_t *session; vppcom_epoll_t *vep; int rv; u32 sid = vep_idx; @@ -3734,11 +3177,10 @@ done: int vppcom_epoll_create (void) { - session_t *vep_session; + vcl_session_t *vep_session; u32 vep_idx; - elog_track_t vep_elog_track; - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); pool_get (vcm->sessions, vep_session); memset (vep_session, 0, sizeof (*vep_session)); vep_idx = vep_session - vcm->sessions; @@ -3751,40 +3193,11 @@ vppcom_epoll_create (void) vep_session->vpp_handle = ~0; vep_session->poll_reg = 0; - if (VPPCOM_DEBUG > 0) - { - vep_session->elog_track.name = - (char *) format (0, "C:%d:VEP:%d%c", vcm->my_client_index, - vep_idx, 0); - elog_track_register (&vcm->elog_main, &vep_session->elog_track); - vep_elog_track = vep_session->elog_track; - } - - clib_spinlock_unlock (&vcm->sessions_lockp); + vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_idx); + VCL_SESSION_UNLOCK (); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: Created vep_idx %u / sid %u!", - getpid (), vep_idx, vep_idx); - - if (VPPCOM_DEBUG > 0) - { - - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "created epoll session:%d", - .format_args = "i4", - }; - - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_elog_track); - ed->data = vep_idx; - /* *INDENT-ON* */ - } + VDBG (0, "VCL<%d>: Created vep_idx %u / sid %u!", + getpid (), vep_idx, vep_idx); return (vep_idx); } @@ -3793,8 +3206,8 @@ int vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, struct epoll_event *event) { - session_t *vep_session; - session_t *session; + vcl_session_t *vep_session; + vcl_session_t *session; int rv; if (vep_idx == session_index) @@ -3804,7 +3217,7 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, return VPPCOM_EINVAL; } - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); rv = vppcom_session_at_index (vep_idx, &vep_session); if (PREDICT_FALSE (rv)) { @@ -3825,9 +3238,8 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, rv = vppcom_session_at_index (session_index, &session); if (PREDICT_FALSE (rv)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: ERROR: Invalid session_index (%u)!", - getpid (), session_index); + VDBG (0, "VCL<%d>: ERROR: Invalid session_index (%u)!", + getpid (), session_index); goto done; } if (PREDICT_FALSE (session->is_vep)) @@ -3849,7 +3261,7 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, } if (vep_session->vep.next_sid != ~0) { - session_t *next_session; + vcl_session_t *next_session; rv = vppcom_session_at_index (vep_session->vep.next_sid, &next_session); if (PREDICT_FALSE (rv)) @@ -3872,7 +3284,7 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, vep_session->vep.next_sid = session_index; /* VCL Event Register handler */ - if (session->state & STATE_LISTEN) + if (session->session_state & STATE_LISTEN) { /* Register handler for connect_request event on listen_session_index */ vce_event_key_t evk; @@ -3883,31 +3295,11 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, vce_poll_wait_connect_request_handler_fn, 0 /* No callback args */ ); } - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, " - "sid %u, events 0x%x, data 0x%llx!", - getpid (), vep_idx, session_index, - event->events, event->data.u64); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "epoll_ctladd: events:%x data:%x", - .format_args = "i4i4i8", - }; - struct - { - u32 events; - u64 event_data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->events = event->events; - ed->event_data = event->data.u64; - /* *INDENT-ON* */ - } + VDBG (1, "VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, " + "sid %u, events 0x%x, data 0x%llx!", + getpid (), vep_idx, session_index, + event->events, event->data.u64); + vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64); break; case EPOLL_CTL_MOD: @@ -3936,11 +3328,9 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, } session->vep.et_mask = VEP_DEFAULT_ET_MASK; session->vep.ev = *event; - if (VPPCOM_DEBUG > 1) - clib_warning - ("VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x," - " data 0x%llx!", getpid (), vep_idx, session_index, event->events, - event->data.u64); + VDBG (1, "VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x," + " data 0x%llx!", getpid (), vep_idx, session_index, event->events, + event->data.u64); break; case EPOLL_CTL_DEL: @@ -3962,7 +3352,7 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, } /* VCL Event Un-register handler */ - if ((session->state & STATE_LISTEN) && vep_session->poll_reg) + if ((session->session_state & STATE_LISTEN) && vep_session->poll_reg) { (void) vce_unregister_handler (&vcm->event_thread, vep_session->poll_reg); @@ -3976,7 +3366,7 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, vep_session->vep.next_sid = session->vep.next_sid; else { - session_t *prev_session; + vcl_session_t *prev_session; rv = vppcom_session_at_index (session->vep.prev_sid, &prev_session); if (PREDICT_FALSE (rv)) { @@ -3990,7 +3380,7 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, } if (session->vep.next_sid != ~0) { - session_t *next_session; + vcl_session_t *next_session; rv = vppcom_session_at_index (session->vep.next_sid, &next_session); if (PREDICT_FALSE (rv)) { @@ -4008,27 +3398,9 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, session->vep.prev_sid = ~0; session->vep.vep_idx = ~0; session->is_vep_session = 0; - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!", - getpid (), vep_idx, session_index); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "epoll_ctldel: vep:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = vep_idx; - /* *INDENT-ON* */ - } + VDBG (1, "VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!", + getpid (), vep_idx, session_index); + vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_idx); break; default: @@ -4039,7 +3411,7 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, vep_verify_epoll_chain (vep_idx); done: - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); return rv; } @@ -4047,8 +3419,7 @@ int vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, int maxevents, double wait_for_time) { - session_t *vep_session; - elog_track_t vep_elog_track; + vcl_session_t *vep_session; int rv; f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; u32 keep_trying = 1; @@ -4064,12 +3435,11 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, } memset (events, 0, sizeof (*events) * maxevents); - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); + VCL_SESSION_LOCK_AND_GET (vep_idx, &vep_session); vep_next_sid = vep_session->vep.next_sid; is_vep = vep_session->is_vep; wait_cont_idx = vep_session->wait_cont_idx; - vep_elog_track = vep_session->elog_track; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); if (PREDICT_FALSE (!is_vep)) { @@ -4080,27 +3450,8 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, } if (PREDICT_FALSE (vep_next_sid == ~0)) { - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: WARNING: vep_idx (%u) is empty!", - getpid (), vep_idx); - if (VPPCOM_DEBUG > 1) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "WRN: vep_idx:%d empty", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_elog_track); - - ed->data = vep_idx; - /* *INDENT-ON* */ - } + VDBG (1, "VCL<%d>: WARNING: vep_idx (%u) is empty!", + getpid (), vep_idx); goto done; } @@ -4108,8 +3459,7 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, { u32 sid; u32 next_sid = ~0; - session_t *session; - elog_track_t session_elog_track; + vcl_session_t *session; for (sid = (wait_cont_idx == ~0) ? vep_next_sid : wait_cont_idx; sid != ~0; sid = next_sid) @@ -4119,7 +3469,7 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, int ready; u64 session_ev_data; - VCL_LOCK_AND_GET_SESSION (sid, &session); + VCL_SESSION_LOCK_AND_GET (sid, &session); next_sid = session->vep.next_sid; session_events = session->vep.ev.events; et_mask = session->vep.et_mask; @@ -4128,64 +3478,19 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, session_vep_idx = session->vep.vep_idx; session_ev_data = session->vep.ev.data.u64; - if (VPPCOM_DEBUG > 0) - { - session_elog_track = session->elog_track; - } - - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); if (PREDICT_FALSE (is_vep)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: ERROR: sid (%u) is a vep!", - getpid (), vep_idx); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR:vep_idx:%d is vep", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - - ed->data = vep_idx; - /* *INDENT-ON* */ - } - + VDBG (0, "VCL<%d>: ERROR: sid (%u) is a vep!", + getpid (), vep_idx); rv = VPPCOM_EINVAL; goto done; } if (PREDICT_FALSE (!is_vep_session)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: ERROR: session (%u) is not " - "a vep session!", getpid (), sid); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR:SID:%d not vep", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - - ed->data = sid; - /* *INDENT-ON* */ - } - + VDBG (0, "VCL<%d>: ERROR: session (%u) is not " + "a vep session!", getpid (), sid); rv = VPPCOM_EINVAL; goto done; } @@ -4202,9 +3507,9 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, if (EPOLLIN & session_events) { - VCL_LOCK_AND_GET_SESSION (sid, &session); + VCL_SESSION_LOCK_AND_GET (sid, &session); ready = vppcom_session_read_ready (session, sid); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); if ((ready > 0) && (EPOLLIN & et_mask)) { add_event = 1; @@ -4231,9 +3536,9 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, if (EPOLLOUT & session_events) { - VCL_LOCK_AND_GET_SESSION (sid, &session); + VCL_SESSION_LOCK_AND_GET (sid, &session); ready = vppcom_session_write_ready (session, sid); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); if ((ready > 0) && (EPOLLOUT & et_mask)) { add_event = 1; @@ -4263,16 +3568,16 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, events[num_ev].data.u64 = session_ev_data; if (EPOLLONESHOT & session_events) { - VCL_LOCK_AND_GET_SESSION (sid, &session); + VCL_SESSION_LOCK_AND_GET (sid, &session); session->vep.ev.events = 0; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } num_ev++; if (num_ev == maxevents) { - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); + VCL_SESSION_LOCK_AND_GET (vep_idx, &vep_session); vep_session->wait_cont_idx = next_sid; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); goto done; } } @@ -4291,9 +3596,9 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, if (wait_cont_idx != ~0) { - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); + VCL_SESSION_LOCK_AND_GET (vep_idx, &vep_session); vep_session->wait_cont_idx = ~0; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } done: return (rv != VPPCOM_OK) ? rv : num_ev; @@ -4303,12 +3608,12 @@ int vppcom_session_attr (uint32_t session_index, uint32_t op, void *buffer, uint32_t * buflen) { - session_t *session; + vcl_session_t *session; int rv = VPPCOM_OK; u32 *flags = buffer; vppcom_endpt_t *ep = buffer; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + VCL_SESSION_LOCK_AND_GET (session_index, &session); ASSERT (session); @@ -4316,53 +3621,14 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { case VPPCOM_ATTR_GET_NREAD: rv = vppcom_session_read_ready (session, session_index); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d", - getpid (), rv); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_NREAD: nread=%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = rv; - /* *INDENT-ON* */ - } - + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d", + getpid (), rv); break; case VPPCOM_ATTR_GET_NWRITE: rv = vppcom_session_write_ready (session, session_index); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d", - getpid (), session_index, rv); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_NWRITE: nwrite=%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = rv; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d", + getpid (), session_index, rv); break; case VPPCOM_ATTR_GET_FLAGS: @@ -4371,33 +3637,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *flags = O_RDWR | (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); *buflen = sizeof (*flags); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, " - "flags = 0x%08x, is_nonblocking = %u", getpid (), - session_index, *flags, - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_NONBLOCK)); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_FLAGS: flags=%x is_nonblk=%d", - .format_args = "i4i4", - }; - struct - { - u32 flags; - u32 is_nonblk; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->flags = *flags; - ed->is_nonblk = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); - /* *INDENT-ON* */ - } - + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, flags = 0x%08x, " + "is_nonblocking = %u", getpid (), + session_index, *flags, + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -4411,32 +3654,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, " - "flags = 0x%08x, is_nonblocking = %u", - getpid (), session_index, *flags, - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_NONBLOCK)); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_FLAGS: flags=%x is_nonblk=%d", - .format_args = "i4i4", - }; - struct - { - u32 flags; - u32 is_nonblk; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->flags = *flags; - ed->is_nonblk = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, flags = 0x%08x," + " is_nonblocking = %u", + getpid (), session_index, *flags, + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -4446,63 +3667,21 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*ep)) && ep->ip)) { - ep->is_ip4 = session->peer_addr.is_ip4; - ep->port = session->peer_port; - if (session->peer_addr.is_ip4) - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip4, + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.rmt_port; + if (session->transport.is_ip4) + clib_memcpy (ep->ip, &session->transport.rmt_ip.ip4, sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip6, + clib_memcpy (ep->ip, &session->transport.rmt_ip.ip6, sizeof (ip6_address_t)); *buflen = sizeof (*ep); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_PEER_ADDR: sid %u, " - "is_ip4 = %u, addr = %U, port %u", getpid (), - session_index, ep->is_ip4, format_ip46_address, - &session->peer_addr.ip46, ep->is_ip4, - clib_net_to_host_u16 (ep->port)); - if (VPPCOM_DEBUG > 0) - { - if (ep->is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_PEER_ADDR: addr:%d.%d.%d.%d:%d", - .format_args = "i1i1i1i1i2", - }; - CLIB_PACKED (struct { - u8 addr[4]; //4 - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->addr[0] = session->peer_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->peer_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->peer_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->peer_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - else - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_PEER_ADDR: addr:IP6:%d", - .format_args = "i2", - }; - CLIB_PACKED (struct { - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - } + VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_PEER_ADDR: sid %u, is_ip4 = %u, " + "addr = %U, port %u", getpid (), + session_index, ep->is_ip4, format_ip46_address, + &session->transport.rmt_ip, + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); } else rv = VPPCOM_EINVAL; @@ -4512,63 +3691,21 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*ep)) && ep->ip)) { - ep->is_ip4 = session->lcl_addr.is_ip4; - ep->port = session->lcl_port; - if (session->lcl_addr.is_ip4) - clib_memcpy (ep->ip, &session->lcl_addr.ip46.ip4, + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.lcl_port; + if (session->transport.is_ip4) + clib_memcpy (ep->ip, &session->transport.lcl_ip.ip4, sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &session->lcl_addr.ip46.ip6, + clib_memcpy (ep->ip, &session->transport.lcl_ip.ip6, sizeof (ip6_address_t)); *buflen = sizeof (*ep); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LCL_ADDR: sid %u, " - "is_ip4 = %u, addr = %U port %d", getpid (), - session_index, ep->is_ip4, format_ip46_address, - &session->lcl_addr.ip46, ep->is_ip4, - clib_net_to_host_u16 (ep->port)); - if (VPPCOM_DEBUG > 0) - { - if (ep->is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LCL_ADDR: addr:%d.%d.%d.%d:%d", - .format_args = "i1i1i1i1i2", - }; - CLIB_PACKED (struct { - u8 addr[4]; //4 - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->addr[0] = session->lcl_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->lcl_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->lcl_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->lcl_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - else - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LCL_ADDR: addr:IP6:%d", - .format_args = "i2", - }; - CLIB_PACKED (struct { - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - } + VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_LCL_ADDR: sid %u, is_ip4 = %u," + " addr = %U port %d", getpid (), + session_index, ep->is_ip4, format_ip46_address, + &session->transport.lcl_ip, + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); } else rv = VPPCOM_EINVAL; @@ -4576,26 +3713,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_GET_LIBC_EPFD: rv = session->libc_epfd; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", - getpid (), rv); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd=%d", - .format_args = "i4", - }; - CLIB_PACKED (struct { - i32 data; - }) *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data = session->libc_epfd; - /* *INDENT-ON* */ - } - + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", + getpid (), rv); break; case VPPCOM_ATTR_SET_LIBC_EPFD: @@ -4605,32 +3724,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, session->libc_epfd = *(int *) buffer; *buflen = sizeof (session->libc_epfd); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, " - "buflen %d", getpid (), session->libc_epfd, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd=%s%d buflen=%d", - .format_args = "t1i4i4", - .n_enum_strings = 2, - .enum_strings = {"", "-",}, - }; - CLIB_PACKED (struct { - u8 sign; - u32 data[2]; - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->sign = (session->libc_epfd < 0); - ed->data[0] = abs(session->libc_epfd); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, " + "buflen %d", getpid (), session->libc_epfd, *buflen); } else rv = VPPCOM_EINVAL; @@ -4639,34 +3734,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_GET_PROTOCOL: if (buffer && buflen && (*buflen >= sizeof (int))) { - *(int *) buffer = session->proto; + *(int *) buffer = session->session_type; *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), " - "buflen %d", getpid (), *(int *) buffer, - *(int *) buffer ? "UDP" : "TCP", *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_PROTOCOL: %s buflen=%d", - .format_args = "t1i4", - .n_enum_strings = 2, - .enum_strings = {"TCP", "UDP",}, - }; - - CLIB_PACKED (struct { - u8 proto; - u32 buflen; - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->proto = session->proto; - ed->buflen = *(int *) buffer; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), buflen %d", + getpid (), *(int *) buffer, *(int *) buffer ? "UDP" : "TCP", + *buflen); } else rv = VPPCOM_EINVAL; @@ -4679,27 +3752,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_LISTEN); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, " - "buflen %d", getpid (), *(int *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LISTEN: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", + getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4711,28 +3765,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *(int *) buffer = 0; *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, " - "buflen %d, #VPP-TBD#", getpid (), - *(int *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_ERROR: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, buflen %d, #VPP-TBD#", + getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4748,28 +3782,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, vcm->cfg.tx_fifo_size); *buflen = sizeof (u32); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(size_t *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + *(size_t *) buffer, *(size_t *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4780,29 +3795,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ session->sndbuf_size = *(u32 *) buffer; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = session->sndbuf_size; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + session->sndbuf_size, session->sndbuf_size, *buflen); } else rv = VPPCOM_EINVAL; @@ -4818,28 +3813,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, vcm->cfg.rx_fifo_size); *buflen = sizeof (u32); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_RX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(size_t *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + *(size_t *) buffer, *(size_t *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4850,29 +3826,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ session->rcvbuf_size = *(u32 *) buffer; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_RX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = session->sndbuf_size; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + session->sndbuf_size, session->sndbuf_size, *buflen); } else rv = VPPCOM_EINVAL; @@ -4886,28 +3842,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_REUSEADDR); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_REUSEADDR: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, " + "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4923,31 +3859,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEADDR); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_REUSEADDR: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_REUSEADDR: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_REUSEADDR: %d, buflen %d," + " #VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_REUSEADDR), *buflen); } else rv = VPPCOM_EINVAL; @@ -4961,28 +3876,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_REUSEPORT); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_REUSEPORT: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4998,31 +3893,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEPORT); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_REUSEPORT: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_REUSEPORT: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_REUSEPORT: %d, buflen %d," + " #VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_REUSEPORT), *buflen); } else rv = VPPCOM_EINVAL; @@ -5036,28 +3910,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_BROADCAST); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_BROADCAST: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5072,31 +3926,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_BROADCAST); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_BROADCAST: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_BROADCAST: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_BROADCAST: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_BROADCAST), *buflen); } else rv = VPPCOM_EINVAL; @@ -5110,28 +3943,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_V6ONLY); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_V6ONLY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5146,30 +3959,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_V6ONLY); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_V6ONLY: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY), *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_V6ONLY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_V6ONLY: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_V6ONLY), *buflen); } else rv = VPPCOM_EINVAL; @@ -5183,28 +3976,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_KEEPALIVE); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_KEEPALIVE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5219,31 +3992,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_KEEPALIVE); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_KEEPALIVE: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_KEEPALIVE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_KEEPALIVE: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_KEEPALIVE), *buflen); } else rv = VPPCOM_EINVAL; @@ -5257,28 +4009,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_TCP_NODELAY); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_NODELAY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5293,31 +4025,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_NODELAY); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_NODELAY: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_NODELAY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_NODELAY: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_TCP_NODELAY), *buflen); } else rv = VPPCOM_EINVAL; @@ -5331,28 +4042,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_TCP_KEEPIDLE); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5367,31 +4058,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPIDLE), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPIDLE); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_TCP_KEEPIDLE), *buflen); } else rv = VPPCOM_EINVAL; @@ -5405,28 +4075,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_TCP_KEEPINTVL); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5441,31 +4091,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPINTVL), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPINTVL); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_TCP_KEEPINTVL), *buflen); } else rv = VPPCOM_EINVAL; @@ -5478,28 +4107,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *(u32 *) buffer = session->user_mss; *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_USER_MSS: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5511,28 +4120,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, /* VPP-TBD */ session->user_mss = *(u32 *) buffer; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_USER_MSS: %u, " - "buflen %d, #VPP-TBD#", getpid (), - session->user_mss, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_USER_MSS: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = session->user_mss; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d, " + "#VPP-TBD#", getpid (), session->user_mss, *buflen); } else rv = VPPCOM_EINVAL; @@ -5544,7 +4133,7 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, } done: - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); return rv; } @@ -5553,49 +4142,30 @@ vppcom_session_recvfrom (uint32_t session_index, void *buffer, uint32_t buflen, int flags, vppcom_endpt_t * ep) { int rv = VPPCOM_OK; - session_t *session = 0; + vcl_session_t *session = 0; if (ep) { - clib_spinlock_lock (&vcm->sessions_lockp); + VCL_SESSION_LOCK (); rv = vppcom_session_at_index (session_index, &session); if (PREDICT_FALSE (rv)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: invalid session, " - "sid (%u) has been closed!", - getpid (), session_index); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "invalid session: %d closed", - .format_args = "i4", - }; - - struct { - u32 data; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); - ed->data = session_index; - /* *INDENT-ON* */ - } + VCL_SESSION_UNLOCK (); + VDBG (0, "VCL<%d>: invalid session, sid (%u) has been closed!", + getpid (), session_index); rv = VPPCOM_EBADFD; - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); goto done; } - ep->is_ip4 = session->peer_addr.is_ip4; - ep->port = session->peer_port; - if (session->peer_addr.is_ip4) - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip4, + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.rmt_port; + if (session->transport.is_ip4) + clib_memcpy (ep->ip, &session->transport.rmt_ip.ip4, sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip6, + clib_memcpy (ep->ip, &session->transport.rmt_ip.ip6, sizeof (ip6_address_t)); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); } if (flags == 0) @@ -5629,9 +4199,8 @@ vppcom_session_sendto (uint32_t session_index, void *buffer, if (flags) { // TBD check the flags and do the right thing - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: handling flags 0x%u (%d) " - "not implemented yet.", getpid (), flags, flags); + VDBG (2, "VCL<%d>: handling flags 0x%u (%d) not implemented yet.", + getpid (), flags, flags); } return (vppcom_session_write (session_index, buffer, buflen)); @@ -5644,32 +4213,31 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) u32 i, keep_trying = 1; int rv, num_ev = 0; - if (VPPCOM_DEBUG > 3) - clib_warning ("VCL<%d>: vp %p, nsids %u, wait_for_time %f", - getpid (), vp, n_sids, wait_for_time); + VDBG (3, "VCL<%d>: vp %p, nsids %u, wait_for_time %f", + getpid (), vp, n_sids, wait_for_time); if (!vp) return VPPCOM_EFAULT; do { - session_t *session; + vcl_session_t *session; for (i = 0; i < n_sids; i++) { ASSERT (vp[i].revents); - VCL_LOCK_AND_GET_SESSION (vp[i].sid, &session); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); + VCL_SESSION_UNLOCK (); if (*vp[i].revents) *vp[i].revents = 0; if (POLLIN & vp[i].events) { - VCL_LOCK_AND_GET_SESSION (vp[i].sid, &session); + VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); rv = vppcom_session_read_ready (session, vp[i].sid); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); if (rv > 0) { *vp[i].revents |= POLLIN; @@ -5693,9 +4261,9 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (POLLOUT & vp[i].events) { - VCL_LOCK_AND_GET_SESSION (vp[i].sid, &session); + VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); rv = vppcom_session_write_ready (session, vp[i].sid); - clib_spinlock_unlock (&vcm->sessions_lockp); + VCL_SESSION_UNLOCK (); if (rv > 0) { *vp[i].revents |= POLLOUT; @@ -5717,7 +4285,7 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) } } - if (0) // Note "done:" label used by VCL_LOCK_AND_GET_SESSION() + if (0) // Note "done:" label used by VCL_SESSION_LOCK_AND_GET() { done: *vp[i].revents = POLLNVAL; @@ -5742,6 +4310,270 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) return num_ev; } +/* + * VPPCOM Event Functions + */ + +void * +vppcom_session_io_thread_fn (void *arg) +{ + vppcom_session_io_thread_t *evt = (vppcom_session_io_thread_t *) arg; + u32 *session_indexes = 0, *session_index; + int i, rv; + u32 bytes = 0; + vcl_session_t *session; + + while (1) + { + vec_reset_length (session_indexes); + VCE_IO_SESSIONS_LOCK (); + pool_foreach (session_index, evt->active_session_indexes, ( + { + vec_add1 + (session_indexes, + *session_index); + } + )); + VCE_IO_SESSIONS_UNLOCK (); + if (session_indexes) + { + for (i = 0; i < vec_len (session_indexes); ++i) + { + VCL_SESSION_LOCK_AND_GET (session_indexes[i], &session); + bytes = svm_fifo_max_dequeue (session->rx_fifo); + VCL_SESSION_UNLOCK (); + + if (bytes) + { + vppcom_ioevent_t *eio; + vce_event_t *ev; + u32 ev_idx; + + VCL_EVENTS_LOCK (); + + pool_get (vcm->event_thread.vce_events, ev); + ev_idx = (u32) (ev - vcm->event_thread.vce_events); + eio = vce_get_event_data (ev, sizeof (*eio)); + ev->evk.eid = VCL_EVENT_IOEVENT_RX_FIFO; + ev->evk.session_index = session_indexes[i]; + eio->bytes = bytes; + eio->session_index = session_indexes[i]; + + VCL_EVENTS_UNLOCK (); + + rv = vce_generate_event (&vcm->event_thread, ev_idx); + } + } + } + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = 1000000; /* 1 millisecond */ + nanosleep (&ts, NULL); + } +done: + VCL_SESSION_UNLOCK (); + return NULL; +} + +int +vppcom_start_io_event_thread (vppcom_session_io_thread_t * evt, + u8 max_sessions) +{ + pthread_cond_init (&(evt->vce_io_cond), NULL); + pthread_mutex_init (&(evt->vce_io_lock), NULL); + + clib_spinlock_init (&(evt->io_sessions_lockp)); + + return pthread_create (&(evt->thread), NULL /* attr */ , + vppcom_session_io_thread_fn, evt); +} + +void +vce_registered_ioevent_handler_fn (void *arg) +{ + vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; + vppcom_ioevent_t *eio; + vce_event_t *ev; + u32 ioevt_ndx = (u64) (reg->handler_fn_args); + vppcom_session_ioevent_t *ioevent, ioevent_; + + VCL_EVENTS_LOCK (); + ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); + eio = vce_get_event_data (ev, sizeof (*eio)); + VCL_EVENTS_UNLOCK (); + + VCL_IO_SESSIONS_LOCK (); + ioevent = pool_elt_at_index (vcm->session_io_thread.ioevents, ioevt_ndx); + ioevent_ = *ioevent; + VCL_IO_SESSIONS_UNLOCK (); + (ioevent_.user_cb) (eio, ioevent_.user_cb_data); + vce_clear_event (&vcm->event_thread, reg->ev_idx); + return; + + /*TODO - Unregister check in close for this listener */ + +} + +void +vce_registered_listener_connect_handler_fn (void *arg) +{ + vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; + vce_event_connect_request_t *ecr; + vce_event_t *ev; + vppcom_endpt_t ep; + + vcl_session_t *new_session; + int rv; + + vppcom_session_listener_t *session_listener = + (vppcom_session_listener_t *) reg->handler_fn_args; + + VCL_EVENTS_LOCK (); + ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); + ecr = vce_get_event_data (ev, sizeof (*ecr)); + VCL_EVENTS_UNLOCK (); + VCL_SESSION_LOCK_AND_GET (ecr->accepted_session_index, &new_session); + + ep.is_ip4 = new_session->transport.is_ip4; + ep.port = new_session->transport.rmt_port; + if (new_session->transport.is_ip4) + clib_memcpy (&ep.ip, &new_session->transport.rmt_ip.ip4, + sizeof (ip4_address_t)); + else + clib_memcpy (&ep.ip, &new_session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); + + vppcom_send_accept_session_reply (new_session->vpp_handle, + new_session->client_context, + 0 /* retval OK */ ); + VCL_SESSION_UNLOCK (); + + (session_listener->user_cb) (ecr->accepted_session_index, &ep, + session_listener->user_cb_data); + + if (vcm->session_io_thread.io_sessions_lockp) + { + /* Throw this new accepted session index into the rx poll thread pool */ + VCL_IO_SESSIONS_LOCK (); + u32 *active_session_index; + pool_get (vcm->session_io_thread.active_session_indexes, + active_session_index); + *active_session_index = ecr->accepted_session_index; + VCL_IO_SESSIONS_UNLOCK (); + } + + /*TODO - Unregister check in close for this listener */ + return; + +done: + ASSERT (0); // If we can't get a lock or accepted session fails, lets blow up. +} + +/** + * @brief vce_poll_wait_connect_request_handler_fn + * - used by vppcom_epoll_xxxx() for listener sessions + * - when a vl_api_accept_session_t_handler() generates an event + * this callback is alerted and sets the fields that vppcom_epoll_wait() + * expects to see. + * + * @param arg - void* to be cast to vce_event_handler_reg_t* + */ +void +vce_poll_wait_connect_request_handler_fn (void *arg) +{ + vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; + vce_event_t *ev; + /* Retrieve the VCL_EVENT_CONNECT_REQ_ACCEPTED event */ + ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); + vce_event_connect_request_t *ecr = vce_get_event_data (ev, sizeof (*ecr)); + + /* Add the accepted_session_index to the FIFO */ + VCL_ACCEPT_FIFO_LOCK (); + clib_fifo_add1 (vcm->client_session_index_fifo, + ecr->accepted_session_index); + VCL_ACCEPT_FIFO_UNLOCK (); + + /* Recycling the event. */ + VCL_EVENTS_LOCK (); + ev->recycle = 1; + clib_fifo_add1 (vcm->event_thread.event_index_fifo, reg->ev_idx); + VCL_EVENTS_UNLOCK (); +} + +int +vppcom_session_register_ioevent_cb (uint32_t session_index, + vppcom_session_ioevent_cb cb, + uint8_t rx, void *ptr) +{ + int rv = VPPCOM_OK; + vce_event_key_t evk; + vppcom_session_ioevent_t *ioevent; + + if (!vcm->session_io_thread.io_sessions_lockp) + rv = vppcom_start_io_event_thread (&vcm->session_io_thread, 100 /* DAW_TODO: ??? hard-coded value */ + ); + + if (rv == VPPCOM_OK) + { + void *io_evt_ndx; + + /* Register handler for ioevent on session_index */ + VCL_IO_SESSIONS_LOCK (); + pool_get (vcm->session_io_thread.ioevents, ioevent); + io_evt_ndx = (void *) (ioevent - vcm->session_io_thread.ioevents); + ioevent->user_cb = cb; + ioevent->user_cb_data = ptr; + VCL_IO_SESSIONS_UNLOCK (); + + evk.session_index = session_index; + evk.eid = rx ? VCL_EVENT_IOEVENT_RX_FIFO : VCL_EVENT_IOEVENT_TX_FIFO; + + (void) vce_register_handler (&vcm->event_thread, &evk, + vce_registered_ioevent_handler_fn, + io_evt_ndx); + } + return rv; +} + +int +vppcom_session_register_listener (uint32_t session_index, + vppcom_session_listener_cb cb, + vppcom_session_listener_errcb + errcb, uint8_t flags, int q_len, void *ptr) +{ + int rv = VPPCOM_OK; + vce_event_key_t evk; + vppcom_session_listener_t *listener_args; + + if (!vcm->session_io_thread.io_sessions_lockp) + rv = vppcom_start_io_event_thread (&vcm->session_io_thread, 100 /* DAW_TODO: ??? hard-coded value */ + ); + if (rv) + { + goto done; + } + rv = vppcom_session_listen (session_index, q_len); + if (rv) + { + goto done; + } + + /* Register handler for connect_request event on listen_session_index */ + listener_args = clib_mem_alloc (sizeof (vppcom_session_listener_t)); // DAW_TODO: Use a pool instead of thrashing the memory allocator! + listener_args->user_cb = cb; + listener_args->user_cb_data = ptr; + listener_args->user_errcb = errcb; + + evk.session_index = session_index; + evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; + (void) vce_register_handler (&vcm->event_thread, &evk, + vce_registered_listener_connect_handler_fn, + listener_args); + +done: + return rv; +} + /* * fd.io coding-style-patch-verification: ON *