#include <vpp/api/vpe_msg_enum.h>
#include <vnet/session/application_interface.h>
#include <vcl/vppcom.h>
+#include <vcl/vcl_event.h>
#include <vlib/unix/unix.h>
#include <vppinfra/vec_bootstrap.h>
#include <vppinfra/elog.h>
{
volatile session_state_t state;
- svm_fifo_t *server_rx_fifo;
- svm_fifo_t *server_tx_fifo;
+ svm_fifo_t *rx_fifo;
+ svm_fifo_t *tx_fifo;
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)
svm_queue_t *vpp_event_queue;
/* Socket configuration state */
- /* TBD: covert 'is_*' vars to bit in session->attr; */
- u8 is_server;
- u8 is_listen;
- u8 is_cut_thru;
- u8 is_nonblocking;
u8 is_vep;
u8 is_vep_session;
u32 attr;
u64 client_queue_address;
u64 options[16];
elog_track_t elog_track;
+ vce_event_handler_reg_t *poll_reg;
} session_t;
typedef struct vppcom_cfg_t_
f64 accept_timeout;
u32 event_ring_size;
char *event_log_path;
+ u8 *vpp_api_filename;
} vppcom_cfg_t;
+/* VPPCOM Event typedefs */
+typedef enum vcl_event_id_
+{
+ VCL_EVENT_CONNECT_REQ_ACCEPTED,
+ VCL_EVENT_N_EVENTS
+} vcl_event_id_t;
+
+typedef struct vce_event_connect_request_
+{
+ u8 size;
+ u8 handled;
+ u32 accepted_session_index;
+} vce_event_connect_request_t;
+
typedef struct vppcom_main_t_
{
u8 init;
u32 *client_session_index_fifo;
int main_cpu;
- /* vpe input queue */
+ /* vpp input queue */
svm_queue_t *vl_input_queue;
/* API client handle */
vppcom_cfg_t cfg;
- /* Event logging */
+ /* Event thread */
+ vce_event_thread_t event_thread;
+
+ /* VPP Event-logger */
elog_main_t elog_main;
elog_track_t elog_track;
return st;
}
+
/*
* VPPCOM Utility Functions
*/
}
session = pool_elt_at_index (vcm->sessions, p[0]);
- ASSERT (session->is_listen);
+ ASSERT (session->state & STATE_LISTEN);
return session;
}
}
+/*
+ * VPPCOM Event Functions
+ */
+
+/**
+ * * @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;
+
+ vce_event_connect_request_t *ecr;
+ vce_event_t *ev;
+
+ ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx);
+
+ ecr = (vce_event_connect_request_t *) ev->data;
+
+ pthread_mutex_lock (®->handler_lock);
+ ecr->handled = 1;
+ pthread_cond_signal (®->handler_cond);
+ pthread_mutex_unlock (®->handler_lock);
+}
+
+/**
+ * @brief vce_epoll_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_epoll_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->sessions_lockp);
+ clib_fifo_add1 (vcm->client_session_index_fifo,
+ ecr->accepted_session_index);
+ clib_spinlock_unlock (&vcm->sessions_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)
{
api_main_t *am = &api_main;
+ vppcom_cfg_t *vcl_cfg = &vcm->cfg;
int rv = VPPCOM_OK;
+ 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...",
- getpid (), app_name);
+ clib_warning ("VCL<%d>: app (%s) connecting to VPP api (%s)...",
+ getpid (), app_name, vcl_cfg->vpp_api_filename);
- if (vl_client_connect_to_vlib ("/vpe-api", app_name,
+ if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename, app_name,
vcm->cfg.vpp_api_q_length) < 0)
{
clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), app_name);
else
{
vcm->vl_input_queue = am->shmem_hdr->vl_input_queue;
- vcm->my_client_index = am->my_client_index;
+ vcm->my_client_index = (u32) am->my_client_index;
vcm->app_state = STATE_APP_CONN_VPP;
if (VPPCOM_DEBUG > 0)
u32 data;
} *ed;
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track);
- ed->data = rv;
+ ed->data = (u32) rv;
/* *INDENT-ON* */
}
return rv;
return VPPCOM_ETIMEDOUT;
}
-static inline int
-vppcom_wait_for_client_session_index (f64 wait_for_time)
-{
- f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time;
-
- do
- {
- if (clib_fifo_elts (vcm->client_session_index_fifo))
- return VPPCOM_OK;
- }
- while (clib_time_now (&vcm->clib_time) < timeout);
-
- if (wait_for_time == 0)
- return VPPCOM_EAGAIN;
-
- if (VPPCOM_DEBUG > 0)
- clib_warning ("VCL<%d>: timeout waiting for client_session_index",
- getpid ());
-
- if (VPPCOM_DEBUG > 0)
- {
- /* *INDENT-OFF* */
- ELOG_TYPE_DECLARE (e) =
- {
- .format = "ERR: timeout waiting for session index :%d",
- .format_args = "i4",
- };
- struct
- {
- u32 data;
- } *ed;
-
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track);
-
- ed->data = getpid();
- /* *INDENT-ON* */
- }
-
- return VPPCOM_ETIMEDOUT;
-}
-
/*
* VPP-API message functions
*/
getpid (), rv, vppcom_retval_str (rv));
return rv;
}
+
return VPPCOM_OK;
}
mp->segment_name, mp->segment_size);
}
+static void
+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);
+}
+
static void
vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp)
{
session_t *session = 0;
u32 session_index;
svm_fifo_t *rx_fifo, *tx_fifo;
- u8 is_cut_thru = 0;
int rv = VPPCOM_OK;
session_index = mp->context;
if (rv)
goto done_unlock;
- /* We've been redirected */
- if (mp->segment_name_length > 0)
- {
- static svm_fifo_segment_create_args_t _a;
- svm_fifo_segment_create_args_t *a = &_a;
-
- is_cut_thru = 1;
- memset (a, 0, sizeof (*a));
- a->segment_name = (char *) mp->segment_name;
- if (VPPCOM_DEBUG > 1)
- clib_warning ("VCL<%d>: cut-thru segment: %s\n",
- getpid (), a->segment_name);
-
- rv = svm_fifo_segment_attach (a);
- vec_reset_length (a->new_segment_indices);
- if (PREDICT_FALSE (rv))
- {
- clib_warning ("VCL<%d>: sm_fifo_segment_attach ('%s') failed",
- getpid (), a->segment_name);
- goto done_unlock;
- }
- }
-
/*
* Setup session
*/
- session->is_cut_thru = is_cut_thru;
session->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address,
svm_queue_t *);
tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
tx_fifo->client_session_index = session_index;
- session->server_rx_fifo = rx_fifo;
- session->server_tx_fifo = tx_fifo;
+ 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,
" session_rx_fifo %p, refcnt %d,"
" session_tx_fifo %p, refcnt %d",
getpid (), mp->handle, session_index,
- session->server_rx_fifo,
- session->server_rx_fifo->refcnt,
- session->server_tx_fifo, session->server_tx_fifo->refcnt);
+ session->rx_fifo,
+ session->rx_fifo->refcnt,
+ session->tx_fifo, session->tx_fifo->refcnt);
done_unlock:
clib_spinlock_unlock (&vcm->sessions_lockp);
}
vl_api_connect_sock_t *cmp;
/* Assumes caller as acquired the spinlock: vcm->sessions_lockp */
- session->is_server = 0;
cmp = vl_msg_api_alloc (sizeof (*cmp));
memset (cmp, 0, sizeof (*cmp));
cmp->_vl_msg_id = ntohs (VL_API_CONNECT_SOCK);
sizeof (session->peer_addr.ip46));
session->lcl_port = mp->lcl_port;
vppcom_session_table_add_listener (mp->handle, session_index);
- session->is_listen = 1;
session->state = STATE_LISTEN;
if (VPPCOM_DEBUG > 1)
svm_fifo_t *rx_fifo, *tx_fifo;
session_t *session, *listen_session;
u32 session_index;
+ vce_event_connect_request_t *ecr;
+ vce_event_t *ev;
+ int rv;
+ u32 ev_idx;
+
clib_spinlock_lock (&vcm->sessions_lockp);
if (!clib_fifo_free_elts (vcm->client_session_index_fifo))
clib_warning ("VCL<%d>: ERROR: couldn't find listen session: "
"unknown vpp listener handle %llx",
getpid (), mp->listener_handle);
+ vppcom_send_accept_session_reply (mp->handle, mp->context,
+ VNET_API_ERROR_INVALID_ARGUMENT);
clib_spinlock_unlock (&vcm->sessions_lockp);
return;
}
+ /* TODO check listener depth and update */
+ /* TODO on "child" fd close, update listener depth */
+
/* Allocate local session and set it up */
pool_get (vcm->sessions, session);
memset (session, 0, sizeof (*session));
session->vpp_handle = mp->handle;
session->client_context = mp->context;
- session->server_rx_fifo = rx_fifo;
- session->server_tx_fifo = tx_fifo;
+ 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->is_cut_thru = 0;
- session->is_server = 1;
session->peer_port = mp->port;
session->peer_addr.is_ip4 = mp->is_ip4;
clib_memcpy (&session->peer_addr.ip46, mp->ip,
session->lcl_port = listen_session->lcl_port;
session->lcl_addr = listen_session->lcl_addr;
- /* TBD: move client_session_index_fifo into listener session */
- clib_fifo_add1 (vcm->client_session_index_fifo, session_index);
+ /* Create an event for handlers */
- clib_spinlock_unlock (&vcm->sessions_lockp);
+ clib_spinlock_lock (&vcm->event_thread.events_lockp);
+
+ 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;
+ 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->handled = 0;
+ ecr->accepted_session_index = session_index;
+
+ clib_spinlock_unlock (&vcm->event_thread.events_lockp);
+
+ 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 "
clib_warning ("ip6");
}
}
-
-}
-
-static void
-vppcom_send_connect_session_reply (session_t * session, u32 session_index,
- u64 vpp_handle, u32 context, int retval)
-{
- vl_api_connect_session_reply_t *rmp;
- u32 len;
- svm_queue_t *client_q;
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs (VL_API_CONNECT_SESSION_REPLY);
-
- if (!session)
- {
- rmp->context = context;
- rmp->handle = vpp_handle;
- rmp->retval = htonl (retval);
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp);
- return;
- }
-
- rmp->context = session->client_context;
- rmp->retval = htonl (retval);
- rmp->handle = session->vpp_handle;
- rmp->server_rx_fifo = pointer_to_uword (session->server_rx_fifo);
- rmp->server_tx_fifo = pointer_to_uword (session->server_tx_fifo);
- rmp->vpp_event_queue_address = pointer_to_uword (session->vpp_event_queue);
- rmp->segment_size = vcm->cfg.segment_size;
- len = vec_len (session->segment_name);
- rmp->segment_name_length = clib_min (len, sizeof (rmp->segment_name));
- clib_memcpy (rmp->segment_name, session->segment_name,
- rmp->segment_name_length - 1);
- clib_memcpy (rmp->lcl_ip, session->peer_addr.ip46.as_u8,
- sizeof (rmp->lcl_ip));
- rmp->is_ip4 = session->peer_addr.is_ip4;
- rmp->lcl_port = session->peer_port;
- client_q = uword_to_pointer (session->client_queue_address, svm_queue_t *);
- ASSERT (client_q);
- vl_msg_api_send_shmem (client_q, (u8 *) & rmp);
-}
-
-/*
- * Acting as server for redirected connect requests
- */
-static void
-vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
-{
- u32 session_index;
- session_t *session = 0;
-
- clib_spinlock_lock (&vcm->sessions_lockp);
- if (!clib_fifo_free_elts (vcm->client_session_index_fifo))
- {
- clib_spinlock_unlock (&vcm->sessions_lockp);
-
- if (VPPCOM_DEBUG > 1)
- clib_warning ("VCL<%d>: client session queue is full!", getpid ());
-
- /* TBD: Fix api to include vpp handle */
- vppcom_send_connect_session_reply (0 /* session */ , 0 /* sid */ ,
- 0 /* handle */ , mp->context,
- VNET_API_ERROR_QUEUE_FULL);
- return;
- }
-
- pool_get (vcm->sessions, session);
- memset (session, 0, sizeof (*session));
- session_index = session - vcm->sessions;
-
- session->client_context = mp->context;
- session->vpp_handle = session_index;
- session->client_queue_address = mp->client_queue_address;
- session->is_cut_thru = 1;
- session->is_server = 1;
- session->lcl_port = mp->port;
- session->lcl_addr.is_ip4 = mp->is_ip4;
- clib_memcpy (&session->lcl_addr.ip46, mp->ip,
- sizeof (session->lcl_addr.ip46));
-
- /* TBD: missing peer info in api msg.
- */
- session->peer_addr.is_ip4 = mp->is_ip4;
- ASSERT (session->lcl_addr.is_ip4 == session->peer_addr.is_ip4);
-
- session->state = STATE_ACCEPT;
- clib_fifo_add1 (vcm->client_session_index_fifo, session_index);
- if (VPPCOM_DEBUG > 1)
- clib_warning ("VCL<%d>: sid %u: Got a cut-thru connect request! "
- "clib_fifo_elts %u!\n", getpid (), session_index,
- clib_fifo_elts (vcm->client_session_index_fifo));
-
- 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);
-
- /* *INDENT-OFF* */
- ELOG_TYPE_DECLARE (e) =
- {
- .format = "cut-thru-connect:S:%d clib_fifo_elts:%d",
- .format_args = "i4i4",
- };
-
- struct
- {
- u32 data[2];
- } *ed;
-
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
-
- ed->data[0] = session_index;
- ed->data[1] = clib_fifo_elts (vcm->client_session_index_fifo);
- /* *INDENT-ON* */
- }
-
clib_spinlock_unlock (&vcm->sessions_lockp);
+
}
static void
vl_api_bind_sock_t *bmp;
/* Assumes caller has acquired spinlock: vcm->sessions_lockp */
- session->is_server = 1;
bmp = vl_msg_api_alloc (sizeof (*bmp));
memset (bmp, 0, sizeof (*bmp));
session_t *session = 0;
int rv;
u64 vpp_handle;
+ elog_track_t session_elog_track;
VCL_LOCK_AND_GET_SESSION (session_index, &session);
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);
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"sending unbind msg! new state 0x%x (%s)",
getpid (), vpp_handle, session_index,
- session->state, vppcom_session_state_str (session->state));
+ STATE_DISCONNECT,
+ vppcom_session_state_str (STATE_DISCONNECT));
if (VPPCOM_DEBUG > 0)
{
u64 handle;
} *ed;
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+ ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track);
ed->handle = vpp_handle;
/* *INDENT-ON* */
}
+
vppcom_send_unbind_sock (vpp_handle);
done:
{
int rv;
session_t *session;
- u8 is_cut_thru, is_listen, is_server;
u64 vpp_handle;
session_state_t state;
VCL_LOCK_AND_GET_SESSION (session_index, &session);
vpp_handle = session->vpp_handle;
- is_server = session->is_server;
- is_listen = session->is_listen;
- is_cut_thru = session->is_cut_thru;
state = session->state;
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
{
- clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: %s "
- "state 0x%x (%s), is_cut_thru %d, is_listen %d",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u "
+ "state 0x%x (%s)",
getpid (), vpp_handle, session_index,
- is_server ? "server" : "client",
- state, vppcom_session_state_str (state),
- is_cut_thru, is_listen);
+ state, vppcom_session_state_str (state));
}
- if (PREDICT_FALSE (is_listen))
+ if (PREDICT_FALSE (state & STATE_LISTEN))
{
clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"Cannot disconnect a listen socket!",
goto done;
}
- /* Through the VPP host stack...
+ /* The peer has already initiated the close,
+ * so send the disconnect session reply.
*/
- else if (!is_cut_thru)
+ if (state & STATE_CLOSE_ON_EMPTY)
{
- /* The peer has already initiated the close,
- * so send the disconnect session reply.
- */
- if (state & STATE_CLOSE_ON_EMPTY)
- {
- 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);
- }
-
- /* 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);
-
- vppcom_send_disconnect_session (vpp_handle, 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);
}
- /* Cut-thru connections...
- *
- * server: free fifos and segment allocated during connect/redirect
- * client: no cleanup required
+ /* Otherwise, send a disconnect session msg...
*/
else
{
- if (is_server)
- {
- svm_fifo_segment_private_t *seg;
-
- VCL_LOCK_AND_GET_SESSION (session_index, &session);
-
- if (VPPCOM_DEBUG > 1)
- clib_warning ("VCL<%d>: sid %d: freeing cut-thru fifos in "
- "sm_seg_index %d! "
- " server_rx_fifo %p, refcnt = %d"
- " server_tx_fifo %p, refcnt = %d",
- getpid (), session_index, session->sm_seg_index,
- session->server_rx_fifo,
- session->server_rx_fifo->refcnt,
- session->server_tx_fifo,
- session->server_tx_fifo->refcnt);
-
- seg = svm_fifo_segment_get_segment (session->sm_seg_index);
- svm_fifo_segment_free_fifo (seg, session->server_rx_fifo,
- FIFO_SEGMENT_RX_FREELIST);
- svm_fifo_segment_free_fifo (seg, session->server_tx_fifo,
- FIFO_SEGMENT_TX_FREELIST);
- svm_fifo_segment_delete (seg);
-
- /* TBD: Send cut-thru disconnect event to client */
+ if (VPPCOM_DEBUG > 1)
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
+ "sending disconnect...",
+ getpid (), vpp_handle, session_index);
- clib_spinlock_unlock (&vcm->sessions_lockp);
- }
- else
- {
- /* TBD: Send cut-thru disconnect event to server */
- }
+ vppcom_send_disconnect_session (vpp_handle, session_index);
}
done:
_(BIND_SOCK_REPLY, bind_sock_reply) \
_(UNBIND_SOCK_REPLY, unbind_sock_reply) \
_(ACCEPT_SESSION, accept_session) \
-_(CONNECT_SOCK, connect_sock) \
_(CONNECT_SESSION_REPLY, connect_session_reply) \
_(DISCONNECT_SESSION, disconnect_session) \
_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \
_(RESET_SESSION, reset_session) \
_(APPLICATION_ATTACH_REPLY, application_attach_reply) \
_(APPLICATION_DETACH_REPLY, application_detach_reply) \
-_(MAP_ANOTHER_SEGMENT, map_another_segment)
+_(MAP_ANOTHER_SEGMENT, map_another_segment) \
+_(UNMAP_SEGMENT, unmap_segment)
static void
vppcom_api_hookup (void)
if (fp == NULL)
{
if (VPPCOM_DEBUG > 0)
- fprintf (stderr, "open configuration file '%s' failed\n", conf_fname);
+ clib_warning ("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)
- goto defaulted;
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VCL<%d>: calloc failed, using default "
+ "heapsize %lld (0x%llx)",
+ getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
+ goto defaulted;
+ }
while (1)
{
argc++;
char **tmp = realloc (argv, argc * sizeof (char *));
if (tmp == NULL)
- goto defaulted;
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("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)
- goto defaulted;
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VCL<%d>: strndup failed, "
+ "using default heapsize %lld (0x%llx)",
+ getpid (), vcl_cfg->heapsize,
+ vcl_cfg->heapsize);
+ goto defaulted;
+ }
argv[argc - 1] = arg;
p = strtok (NULL, " \t\n");
}
char **tmp = realloc (argv, (argc + 1) * sizeof (char *));
if (tmp == NULL)
- goto defaulted;
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VCL<%d>: realloc failed, "
+ "using default heapsize %lld (0x%llx)",
+ getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
+ goto defaulted;
+ }
argv = tmp;
argv[argc] = NULL;
"PROT_READ | PROT_WRITE,MAP_SHARED | MAP_ANONYMOUS, "
"-1, 0) failed!",
getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
+ ASSERT (vcl_mem != MAP_FAILED);
return;
}
heap = clib_mem_init (vcl_mem, vcl_cfg->heapsize);
if (!heap)
{
clib_warning ("VCL<%d>: ERROR: clib_mem_init() failed!", getpid ());
+ ASSERT (heap);
return;
}
vcl_mem = clib_mem_alloc (sizeof (_vppcom_main));
if (!vcl_mem)
{
clib_warning ("VCL<%d>: ERROR: clib_mem_alloc() failed!", getpid ());
+ ASSERT (vcl_mem);
return;
}
if (fd < 0)
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("VCL<%d>: open configuration file '%s' failed!",
+ clib_warning ("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'", getpid (), conf_fname);
+ clib_warning ("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'",
- getpid (), conf_fname);
+ clib_warning ("VCL<%d>: not a regular file `%s', "
+ "using default configuration", getpid (), conf_fname);
goto file_done;
}
else if (unformat (line_input, "api-prefix %s", &chroot_path))
{
vec_terminate_c_string (chroot_path);
+ if (vcl_cfg->vpp_api_filename)
+ vec_free (vcl_cfg->vpp_api_filename);
+ vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c",
+ chroot_path, 0);
vl_set_memory_root_path ((char *) chroot_path);
+
if (VPPCOM_DEBUG > 0)
- clib_warning ("VCL<%d>: configured api-prefix %s",
- getpid (), chroot_path);
+ clib_warning ("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))
{
u32 tmp;
if (sscanf (env_var_str, "%u", &tmp) != 1)
- clib_warning ("VCL<%d>: Invalid debug level specified in "
- "the environment variable "
- VPPCOM_ENV_DEBUG
+ clib_warning ("VCL<%d>: WARNING: Invalid debug level specified "
+ "in the environment variable " VPPCOM_ENV_DEBUG
" (%s)!\n", getpid (), env_var_str);
else
{
vcm->debug = tmp;
- clib_warning ("VCL<%d>: configured VCL debug level (%u) from "
- VPPCOM_ENV_DEBUG "!", getpid (), vcm->debug);
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VCL<%d>: configured VCL debug level (%u) from "
+ VPPCOM_ENV_DEBUG "!", getpid (), vcm->debug);
}
}
conf_fname = getenv (VPPCOM_ENV_CONF);
if (!conf_fname)
- {
- conf_fname = VPPCOM_CONF_DEFAULT;
- if (VPPCOM_DEBUG > 0)
- clib_warning ("VCL<%d>: getenv '%s' failed!", getpid (),
- VPPCOM_ENV_CONF);
- }
+ conf_fname = VPPCOM_CONF_DEFAULT;
vppcom_cfg_heapsize (conf_fname);
+ vcl_cfg = &vcm->cfg;
clib_fifo_validate (vcm->client_session_index_fifo,
vcm->cfg.listen_queue_size);
vppcom_cfg_read (conf_fname);
+
+ env_var_str = getenv (VPPCOM_ENV_API_PREFIX);
+ if (env_var_str)
+ {
+ if (vcl_cfg->vpp_api_filename)
+ vec_free (vcl_cfg->vpp_api_filename);
+ vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c",
+ 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);
+ }
env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID);
if (env_var_str)
{
{
u64 tmp;
if (sscanf (env_var_str, "%lu", &tmp) != 1)
- clib_warning ("VCL<%d>: Invalid namespace secret specified in "
- "the environment variable "
+ clib_warning ("VCL<%d>: WARNING: Invalid namespace secret "
+ "specified in the environment variable "
VPPCOM_ENV_APP_NAMESPACE_SECRET
" (%s)!\n", getpid (), env_var_str);
else
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: configured namespace secret "
"(%lu) from "
- VPPCOM_ENV_APP_NAMESPACE_ID
+ VPPCOM_ENV_APP_NAMESPACE_SECRET
"!", getpid (), vcm->cfg.namespace_secret);
}
}
if (vcm->my_client_index == ~0)
{
+
+ /* API hookup and connect to VPP */
vppcom_api_hookup ();
vcm->app_state = STATE_APP_START;
rv = vppcom_connect_to_vpp (app_name);
return rv;
}
+ /* State event handling thread */
+
+ rv = vce_start_event_thread (&(vcm->event_thread), 20);
+
+
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: sending session enable", getpid ());
{
session_t *session;
u32 session_index;
+ session_state_t state;
+ elog_track_t session_elog_track;
clib_spinlock_lock (&vcm->sessions_lockp);
pool_get (vcm->sessions, session);
session->proto = proto;
session->state = STATE_START;
- session->is_nonblocking = is_nonblocking ? 1 : 0;
+ state = session->state;
session->vpp_handle = ~0;
- clib_spinlock_unlock (&vcm->sessions_lockp);
- if (VPPCOM_DEBUG > 0)
- clib_warning ("VCL<%d>: sid %u", getpid (), session_index);
+ if (is_nonblocking)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK);
if (VPPCOM_DEBUG > 0)
{
(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);
+
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VCL<%d>: sid %u", getpid (), session_index);
+ if (VPPCOM_DEBUG > 0)
+ {
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
u32 data[3];
} *ed;
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
- ed->data[0] = session->proto;
- ed->data[1] = session->state;
- ed->data[2] = session->is_nonblocking;
+ 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* */
}
{
session_t *session = 0;
int rv;
- u8 is_listen;
u8 is_vep;
u8 is_vep_session;
u32 next_sid;
u64 vpp_handle;
uword *p;
session_state_t state;
+ elog_track_t session_elog_track;
VCL_LOCK_AND_GET_SESSION (session_index, &session);
- is_listen = session->is_listen;
is_vep = session->is_vep;
is_vep_session = session->is_vep_session;
next_sid = session->vep.next_sid;
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;
+ }
+
if (VPPCOM_DEBUG > 0)
{
if (is_vep)
vep_idx, rv, vppcom_retval_str (rv));
}
- if (is_listen)
+ if (state & STATE_LISTEN)
{
- if (state & STATE_LISTEN)
+ rv = vppcom_session_unbind (session_index);
+ if (PREDICT_FALSE (rv < 0))
{
- 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));
- }
+ 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));
}
}
hash_unset (vcm->session_index_by_vpp_handles, vpp_handle);
}
pool_put_index (vcm->sessions, session_index);
+
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
u32 data;
} *ed;
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+ ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track);
ed->data = rv;
/* *INDENT-ON* */
}
{
if (session->lcl_addr.is_ip4)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "bind local:%s:%d.%d.%d.%d:%d ",
u8 proto;
u8 addr[4];
u16 port;
- }) * ed;
+ }) *ed;
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
ed->proto = session->proto;
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);
if (listen_session->is_vep)
}
listen_vpp_handle = listen_session->vpp_handle;
- if (listen_session->is_listen)
+ if (listen_session->state & STATE_LISTEN)
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
}
int
-vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep,
- uint32_t flags)
+validate_args_session_accept_ (session_t * listen_session)
{
- session_t *listen_session = 0;
- session_t *client_session = 0;
- u32 client_session_index = ~0, n_fifos;
- int rv;
- f64 wait_for;
- char *cut_thru_str;
- u64 listen_vpp_handle;
-
- VCL_LOCK_AND_GET_SESSION (listen_session_index, &listen_session);
+ u32 listen_session_index = listen_session - vcm->sessions;
+ /* Input validation - expects spinlock on sessions_lockp */
if (listen_session->is_vep)
{
- clib_spinlock_unlock (&vcm->sessions_lockp);
clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an "
"epoll session!", getpid (), listen_session_index);
- rv = VPPCOM_EBADFD;
- goto done;
+ return VPPCOM_EBADFD;
}
- listen_vpp_handle = listen_session->vpp_handle;
if (listen_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_vpp_handle, listen_session_index,
+ listen_session->vpp_handle, listen_session_index,
listen_session->state,
vppcom_session_state_str (listen_session->state));
+ return VPPCOM_EBADFD;
+ }
+ return VPPCOM_OK;
+}
+
+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;
+ u32 client_session_index = ~0;
+ int rv;
+ u64 listen_vpp_handle;
+ vce_event_handler_reg_t *reg;
+ vce_event_t *ev;
+ vce_event_connect_request_t *result;
+ struct timespec ts;
+ struct timeval tv;
+ int millisecond_timeout = 1;
+ int hours_timeout = 20 * 60 * 60;
+
+ VCL_LOCK_AND_GET_SESSION (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);
- rv = VPPCOM_EBADFD;
goto done;
}
- wait_for = (listen_session->is_nonblocking) ? 0 : vcm->cfg.accept_timeout;
+
+ /* Using an aggressive timer of 1ms and a generous timer of
+ * 20 hours, we can implement a blocking and non-blocking listener
+ * as both event and time driven */
+ gettimeofday (&tv, NULL);
+ ts.tv_nsec = (tv.tv_usec * 1000) + (1000 * millisecond_timeout);
+ ts.tv_sec = tv.tv_sec;
+
+ /* Predict that the Listener is blocking more often than not */
+ if (PREDICT_TRUE (!VCL_SESS_ATTR_TEST (listen_session->attr,
+ VCL_SESS_ATTR_NONBLOCK)))
+ ts.tv_sec += hours_timeout;
clib_spinlock_unlock (&vcm->sessions_lockp);
- while (1)
+ /* Register handler for connect_request event on listen_session_index */
+ vce_event_key_t evk;
+ evk.session_index = listen_session_index;
+ evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED;
+ reg = vce_register_handler (&vcm->event_thread, &evk,
+ vce_connect_request_handler_fn);
+ ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx);
+
+ result = (vce_event_connect_request_t *) ev->data;
+ pthread_mutex_lock (®->handler_lock);
+ while (!result->handled)
{
- rv = vppcom_wait_for_client_session_index (wait_for);
- if (rv)
+ rv =
+ pthread_cond_timedwait (®->handler_cond, ®->handler_lock, &ts);
+ if (rv == ETIMEDOUT)
{
- if ((VPPCOM_DEBUG > 0))
- clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
- "accept failed! returning %d (%s)", getpid (),
- listen_vpp_handle, listen_session_index,
- rv, vppcom_retval_str (rv));
- if (wait_for == 0)
- goto done;
+ rv = VPPCOM_EAGAIN;
+ goto cleanup;
}
- else
- break;
}
+ client_session_index = result->accepted_session_index;
+
+
+ /* Remove from the FIFO used to service epoll */
clib_spinlock_lock (&vcm->sessions_lockp);
- clib_fifo_sub1 (vcm->client_session_index_fifo, client_session_index);
+ if (clib_fifo_elts (vcm->client_session_index_fifo))
+ {
+ u32 tmp_client_session_index;
+ clib_fifo_sub1 (vcm->client_session_index_fifo,
+ tmp_client_session_index);
+ if (tmp_client_session_index != client_session_index)
+ clib_fifo_add1 (vcm->client_session_index_fifo,
+ tmp_client_session_index);
+ }
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+
rv = vppcom_session_at_index (client_session_index, &client_session);
if (PREDICT_FALSE (rv))
{
goto done;
}
- client_session->is_nonblocking = (flags & O_NONBLOCK) ? 1 : 0;
+ if (flags & O_NONBLOCK)
+ VCL_SESS_ATTR_SET (client_session->attr, VCL_SESS_ATTR_NONBLOCK);
+ 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, client_session->is_nonblocking);
+ flags, VCL_SESS_ATTR_TEST (client_session->attr,
+ VCL_SESS_ATTR_NONBLOCK));
if (ep)
{
- ep->is_cut_thru = client_session->is_cut_thru;
ep->is_ip4 = client_session->peer_addr.is_ip4;
ep->port = client_session->peer_port;
if (client_session->peer_addr.is_ip4)
sizeof (ip6_address_t));
}
- if (client_session->is_server && client_session->is_cut_thru)
- {
- static svm_fifo_segment_create_args_t _a;
- svm_fifo_segment_create_args_t *a = &_a;
- svm_fifo_segment_private_t *seg;
-
- cut_thru_str = " cut-thru ";
-
- /* Create the segment */
- memset (a, 0, sizeof (*a));
- a->segment_name = (char *)
- format ((u8 *) a->segment_name, "%d:segment%d%c",
- getpid (), vcm->unique_segment_index++, 0);
- a->segment_size = vcm->cfg.segment_size;
-
- rv = svm_fifo_segment_create (a);
- if (PREDICT_FALSE (rv))
- {
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
- "client sid %u svm_fifo_segment_create ('%s') "
- "failed! rv %d", getpid (), listen_vpp_handle,
- listen_session_index, client_session_index,
- a->segment_name, rv);
- vec_reset_length (a->new_segment_indices);
- rv = VNET_API_ERROR_URI_FIFO_CREATE_FAILED;
- vppcom_send_connect_session_reply (client_session,
- client_session_index,
- client_session->vpp_handle,
- client_session->client_context,
- rv);
- clib_spinlock_unlock (&vcm->sessions_lockp);
- rv = VPPCOM_ENOMEM;
- goto done;
- }
-
- client_session->segment_name = vec_dup ((u8 *) a->segment_name);
- client_session->sm_seg_index = a->new_segment_indices[0];
- vec_free (a->new_segment_indices);
-
- seg = svm_fifo_segment_get_segment (client_session->sm_seg_index);
- if (vcm->cfg.preallocated_fifo_pairs)
- {
- n_fifos = vcm->cfg.preallocated_fifo_pairs;
- svm_fifo_segment_preallocate_fifo_pairs (seg, vcm->cfg.rx_fifo_size,
- vcm->cfg.tx_fifo_size,
- &n_fifos);
- }
-
- client_session->server_rx_fifo =
- svm_fifo_segment_alloc_fifo (seg, vcm->cfg.rx_fifo_size,
- FIFO_SEGMENT_RX_FREELIST);
- if (PREDICT_FALSE (!client_session->server_rx_fifo))
- {
- svm_fifo_segment_delete (seg);
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
- "client sid %u rx fifo alloc failed! "
- "size %ld (0x%lx)", getpid (), listen_vpp_handle,
- listen_session_index, client_session_index,
- vcm->cfg.rx_fifo_size, vcm->cfg.rx_fifo_size);
- rv = VNET_API_ERROR_URI_FIFO_CREATE_FAILED;
- vppcom_send_connect_session_reply (client_session,
- client_session_index,
- client_session->vpp_handle,
- client_session->client_context,
- rv);
- clib_spinlock_unlock (&vcm->sessions_lockp);
- rv = VPPCOM_ENOMEM;
- goto done;
- }
- client_session->server_rx_fifo->master_session_index =
- client_session_index;
-
- client_session->server_tx_fifo =
- svm_fifo_segment_alloc_fifo (seg, vcm->cfg.tx_fifo_size,
- FIFO_SEGMENT_TX_FREELIST);
- if (PREDICT_FALSE (!client_session->server_tx_fifo))
- {
- svm_fifo_segment_delete (seg);
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
- "client sid %u tx fifo alloc failed! "
- "size %ld (0x%lx)", getpid (), listen_vpp_handle,
- listen_session_index, client_session_index,
- vcm->cfg.tx_fifo_size, vcm->cfg.tx_fifo_size);
- rv = VNET_API_ERROR_URI_FIFO_CREATE_FAILED;
- vppcom_send_connect_session_reply (client_session,
- client_session_index,
- client_session->vpp_handle,
- client_session->client_context,
- rv);
- clib_spinlock_unlock (&vcm->sessions_lockp);
- rv = VPPCOM_ENOMEM;
- goto done;
- }
- client_session->server_tx_fifo->master_session_index =
- client_session_index;
-
- if (VPPCOM_DEBUG > 1)
- clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: client sid %u "
- "created segment '%s', rx_fifo %p, tx_fifo %p",
- getpid (), listen_vpp_handle, listen_session_index,
- client_session_index, client_session->segment_name,
- client_session->server_rx_fifo,
- client_session->server_tx_fifo);
-
-#ifdef CUT_THRU_EVENT_QUEUE /* TBD */
- {
- void *oldheap;
- ssvm_shared_header_t *sh = seg->ssvm.sh;
-
- ssvm_lock_non_recursive (sh, 1);
- oldheap = ssvm_push_heap (sh);
- event_q = client_session->vpp_event_queue =
- svm_queue_init (vcm->cfg.event_queue_size,
- sizeof (session_fifo_event_t),
- getpid (), 0 /* signal not sent */ );
- ssvm_pop_heap (oldheap);
- ssvm_unlock_non_recursive (sh);
- }
-#endif
- vppcom_send_connect_session_reply (client_session,
- client_session_index,
- client_session->vpp_handle,
- client_session->client_context,
- 0 /* retval OK */ );
- }
- else
- {
- cut_thru_str = " ";
- vppcom_send_accept_session_reply (client_session->vpp_handle,
- client_session->client_context,
- 0 /* retval OK */ );
- }
+ vppcom_send_accept_session_reply (client_session->vpp_handle,
+ 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%sconnection to local %s address "
+ "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, cut_thru_str,
+ 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,
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 cut-thru: listen_handle:%x from_handle:%x",
+ .format = "accept: listen_handle:%x from_handle:%x",
.format_args = "i8i8",
};
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e2) =
{
- .format = "accept cut-thru: S:%d %d.%d.%d.%d:%d ",
+ .format = "accept: S:%d %d.%d.%d.%d:%d ",
.format_args = "i4i1i1i1i1i2",
};
u32 session;
u8 addr[4];
u16 port;
- }) * ed2;
+ }) *ed2;
ed2 =
ELOG_TRACK_DATA (&vcm->elog_main, e2, client_session->elog_track);
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, ev);
+ pthread_mutex_unlock (®->handler_lock);
done:
return rv;
}
vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep)
{
session_t *session = 0;
+ u64 vpp_handle = 0;
int rv, retval = VPPCOM_OK;
- u64 vpp_handle = ~0;
VCL_LOCK_AND_GET_SESSION (session_index, &session);
goto done;
}
- vpp_handle = session->vpp_handle;
- if (PREDICT_FALSE (session->is_server))
- {
- clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: is in use "
- "as a server session!", getpid (), vpp_handle,
- session_index);
- rv = VPPCOM_EBADFD;
- goto done;
- }
-
if (PREDICT_FALSE (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 (), vpp_handle, session_index,
+ 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,
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connecting to server "
"%s %U port %d proto %s",
- getpid (), vpp_handle, session_index,
+ 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,
{
rv = retval;
if (VPPCOM_DEBUG > 0)
- 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));
+ {
+ 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));
+ 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!",
svm_fifo_t *rx_fifo;
int n_read = 0;
int rv;
- char *fifo_str;
+ int is_nonblocking;
+
+ u64 vpp_handle;
u32 poll_et;
session_state_t state;
- u8 is_server;
- u8 is_nonblocking;
- u64 vpp_handle;
ASSERT (buf);
VCL_LOCK_AND_GET_SESSION (session_index, &session);
+ is_nonblocking = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK);
+ rx_fifo = session->rx_fifo;
+ state = session->state;
+ vpp_handle = session->vpp_handle;
+
if (PREDICT_FALSE (session->is_vep))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
goto done;
}
- vpp_handle = session->vpp_handle;
- is_server = session->is_server;
- is_nonblocking = session->is_nonblocking;
- state = session->state;
if (PREDICT_FALSE (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
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,
- is_server ? "server" : "client", state,
+ getpid (), vpp_handle, session_index, state,
vppcom_session_state_str (state),
rv, vppcom_retval_str (rv));
goto done;
}
- rx_fifo = ((!session->is_cut_thru || is_server) ?
- session->server_rx_fifo : session->server_tx_fifo);
- fifo_str = ((!session->is_cut_thru || is_server) ?
- "server_rx_fifo" : "server_tx_fifo");
clib_spinlock_unlock (&vcm->sessions_lockp);
do
if (state & STATE_CLOSE_ON_EMPTY)
{
- session_state_t new_state = STATE_DISCONNECT;
rv = VPPCOM_ECONNRESET;
if (VPPCOM_DEBUG > 1)
{
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo "
- "with %s session state 0x%x (%s)!"
+ "with session state 0x%x (%s)!"
" Setting state to 0x%x (%s), returning %d (%s)",
- getpid (), vpp_handle, session_index,
- is_server ? "server" : "client",
+ getpid (), session->vpp_handle, session_index,
state, vppcom_session_state_str (state),
- new_state, vppcom_session_state_str (new_state),
- rv, vppcom_retval_str (rv));
+ STATE_DISCONNECT,
+ vppcom_session_state_str (STATE_DISCONNECT), rv,
+ vppcom_retval_str (rv));
}
- session->state = new_state;
+ session->state = STATE_DISCONNECT;
}
else
rv = VPPCOM_EAGAIN;
{
if (rv > 0)
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: read %d bytes "
- "from %s (%p)", getpid (), vpp_handle,
- session_index, n_read, fifo_str, rx_fifo);
+ "from (%p)", getpid (), vpp_handle,
+ session_index, n_read, rx_fifo);
else
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: nothing read! "
"returning %d (%s)", getpid (), vpp_handle,
static inline int
vppcom_session_read_ready (session_t * session, u32 session_index)
{
- svm_fifo_t *rx_fifo = 0;
int ready = 0;
u32 poll_et;
int rv;
- u8 is_server = session->is_server;
session_state_t state = session->state;
u64 vpp_handle = session->vpp_handle;
goto done;
}
- if (session->is_listen)
- ready = clib_fifo_elts (vcm->client_session_index_fifo);
+ if (session->state & STATE_LISTEN)
+ {
+ ready = clib_fifo_elts (vcm->client_session_index_fifo);
+ }
else
{
if (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN | STATE_LISTEN)))
VPPCOM_ENOTCONN);
if (VPPCOM_DEBUG > 1)
- clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: %s session is "
+ 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,
- is_server ? "server" : "client",
state, vppcom_session_state_str (state),
rv, vppcom_retval_str (rv));
goto done;
}
- rx_fifo = ((!session->is_cut_thru || is_server) ?
- session->server_rx_fifo : session->server_tx_fifo);
-
- ready = svm_fifo_max_dequeue (rx_fifo);
+ ready = svm_fifo_max_dequeue (session->rx_fifo);
}
if (ready == 0)
if (state & STATE_CLOSE_ON_EMPTY)
{
rv = VPPCOM_ECONNRESET;
- session_state_t new_state = STATE_DISCONNECT;
if (VPPCOM_DEBUG > 1)
{
clib_warning ("VCL<%d>: vpp handle 0x%llx, "
"sid %u: Empty fifo with"
- " %s session state 0x%x (%s)! Setting state to "
+ " session state 0x%x (%s)! Setting state to "
"0x%x (%s), returning %d (%s)",
getpid (), session_index, vpp_handle,
- is_server ? "server" : "client",
state, vppcom_session_state_str (state),
- new_state, vppcom_session_state_str (new_state),
- rv, vppcom_retval_str (rv));
+ STATE_DISCONNECT,
+ vppcom_session_state_str (STATE_DISCONNECT), rv,
+ vppcom_retval_str (rv));
}
- session->state = new_state;
+ session->state = STATE_DISCONNECT;
goto done;
}
}
vppcom_session_write (uint32_t session_index, void *buf, size_t n)
{
session_t *session = 0;
- svm_fifo_t *tx_fifo;
+ svm_fifo_t *tx_fifo = 0;
svm_queue_t *q;
session_fifo_event_t evt;
- int rv, n_write;
- char *fifo_str;
- u32 poll_et;
- u8 is_server;
- u8 is_nonblocking;
session_state_t state;
+ int rv, n_write, is_nonblocking;
+ u32 poll_et;
u64 vpp_handle;
ASSERT (buf);
VCL_LOCK_AND_GET_SESSION (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;
+
if (PREDICT_FALSE (session->is_vep))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"cannot write to an epoll session!",
- getpid (), session->vpp_handle, session_index);
+ getpid (), vpp_handle, session_index);
rv = VPPCOM_EBADFD;
goto done;
}
- is_server = session->is_server;
- is_nonblocking = session->is_nonblocking;
- vpp_handle = session->vpp_handle;
- state = session->state;
- if (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))
+ if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))
{
- rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN);
+ rv =
+ ((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: "
- "%s session is not open! state 0x%x (%s)",
+ "session is not open! state 0x%x (%s)",
getpid (), vpp_handle, session_index,
- is_server ? "server" : "client", state,
- vppcom_session_state_str (state));
+ state, vppcom_session_state_str (state));
goto done;
}
- tx_fifo = ((!session->is_cut_thru || is_server) ?
- session->server_tx_fifo : session->server_rx_fifo);
- fifo_str = ((!session->is_cut_thru || is_server) ?
- "server_tx_fifo" : "server_rx_fifo");
clib_spinlock_unlock (&vcm->sessions_lockp);
do
while (!is_nonblocking && (n_write <= 0));
/* If event wasn't set, add one */
- if (!session->is_cut_thru && (n_write > 0) && svm_fifo_set_event (tx_fifo))
+ if ((n_write > 0) && svm_fifo_set_event (tx_fifo))
{
/* Fabricate TX event, send to vpp */
evt.fifo = tx_fifo;
if (poll_et)
session->vep.et_mask |= EPOLLOUT;
- if (state & STATE_CLOSE_ON_EMPTY)
+ if (session->state & STATE_CLOSE_ON_EMPTY)
{
- session_state_t new_state = STATE_DISCONNECT;
rv = VPPCOM_ECONNRESET;
if (VPPCOM_DEBUG > 1)
{
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
- "Empty fifo with %s session state 0x%x (%s)!"
+ "Empty fifo with session state 0x%x (%s)!"
" Setting state to 0x%x (%s), returning %d (%s)",
- getpid (), vpp_handle, session_index,
- is_server ? "server" : "client",
- state, vppcom_session_state_str (state),
- new_state, vppcom_session_state_str (new_state),
- rv, vppcom_retval_str (rv));
+ 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 = new_state;
+ session->state = STATE_DISCONNECT;
}
else
rv = VPPCOM_EAGAIN;
{
if (n_write <= 0)
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
- "FIFO-FULL %s (%p)", getpid (), vpp_handle,
- session_index, fifo_str, tx_fifo);
+ "FIFO-FULL (%p)", getpid (), vpp_handle,
+ session_index, tx_fifo);
else
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
- "wrote %d bytes to %s (%p)", getpid (), vpp_handle,
- session_index, n_write, fifo_str, tx_fifo);
+ "wrote %d bytes tx-fifo: (%p)", getpid (),
+ vpp_handle, session_index, n_write, tx_fifo);
}
done:
return rv;
static inline int
vppcom_session_write_ready (session_t * session, u32 session_index)
{
- svm_fifo_t *tx_fifo;
- char *fifo_str;
int ready;
u32 poll_et;
int rv;
- u8 is_server = session->is_server;
- session_state_t state = session->state;
+
+ ASSERT (session);
/* Assumes caller has acquired spinlock: vcm->sessions_lockp */
if (PREDICT_FALSE (session->is_vep))
goto done;
}
- if (PREDICT_FALSE (session->is_listen))
+ if (PREDICT_FALSE (session->state & STATE_LISTEN))
{
clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"cannot write to a listen session!",
goto done;
}
- if (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))
+ if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))
{
session_state_t state = session->state;
rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN);
clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
- "%s session is not open! state 0x%x (%s), "
+ "session is not open! state 0x%x (%s), "
"returning %d (%s)", getpid (), session->vpp_handle,
- session_index, is_server ? "server" : "client",
+ session_index,
state, vppcom_session_state_str (state),
rv, vppcom_retval_str (rv));
goto done;
}
- tx_fifo = ((!session->is_cut_thru || session->is_server) ?
- session->server_tx_fifo : session->server_rx_fifo);
- fifo_str = ((!session->is_cut_thru || session->is_server) ?
- "server_tx_fifo" : "server_rx_fifo");
-
- ready = svm_fifo_max_enqueue (tx_fifo);
+ 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,
- fifo_str, tx_fifo, ready);
+ session->tx_fifo, ready);
if (ready == 0)
{
if (poll_et)
session->vep.et_mask |= EPOLLOUT;
- if (state & STATE_CLOSE_ON_EMPTY)
+ if (session->state & STATE_CLOSE_ON_EMPTY)
{
rv = VPPCOM_ECONNRESET;
- session_state_t new_state = STATE_DISCONNECT;
if (VPPCOM_DEBUG > 1)
{
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
- "Empty fifo with %s session "
+ "Empty fifo with session "
"state 0x%x (%s)! Setting state to 0x%x (%s), "
"returning %d (%s)", getpid (),
session->vpp_handle, session_index,
- is_server ? "server" : "client",
- state, vppcom_session_state_str (state),
- new_state, vppcom_session_state_str (new_state),
- rv, vppcom_retval_str (rv));
+ session->state,
+ vppcom_session_state_str (session->state),
+ STATE_DISCONNECT,
+ vppcom_session_state_str (STATE_DISCONNECT), rv,
+ vppcom_retval_str (rv));
}
- session->state = new_state;
+ session->state = STATE_DISCONNECT;
goto done;
}
}
{
session_t *vep_session;
u32 vep_idx;
+ elog_track_t vep_elog_track;
clib_spinlock_lock (&vcm->sessions_lockp);
pool_get (vcm->sessions, vep_session);
vep_session->vep.prev_sid = ~0;
vep_session->wait_cont_idx = ~0;
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);
if (VPPCOM_DEBUG > 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);
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
u32 data;
} *ed;
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_session->elog_track);
+ ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_elog_track);
ed->data = vep_idx;
/* *INDENT-ON* */
}
{
session_t *vep_session;
session_t *session;
+ vce_event_t *ev = 0;
int rv;
if (vep_idx == session_index)
session->is_vep = 0;
session->is_vep_session = 1;
vep_session->vep.next_sid = session_index;
+
+ /* VCL Event Register handler */
+ if (session->state & STATE_LISTEN)
+ {
+ /* Register handler for connect_request event on listen_session_index */
+ vce_event_key_t evk;
+ evk.session_index = session_index;
+ evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED;
+ vep_session->poll_reg =
+ vce_register_handler (&vcm->event_thread, &evk,
+ vce_epoll_wait_connect_request_handler_fn);
+ }
if (VPPCOM_DEBUG > 1)
clib_warning ("VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, "
"sid %u, events 0x%x, data 0x%llx!",
goto done;
}
+ /* VCL Event Un-register handler */
+ if ((session->state & STATE_LISTEN) && vep_session->poll_reg)
+ {
+ ev = vce_get_event_from_index (&vcm->event_thread,
+ vep_session->poll_reg->ev_idx);
+ (void) vce_unregister_handler (&vcm->event_thread, ev);
+ }
+
vep_session->wait_cont_idx =
(vep_session->wait_cont_idx == session_index) ?
session->vep.next_sid : vep_session->wait_cont_idx;
int maxevents, double wait_for_time)
{
session_t *vep_session;
+ elog_track_t vep_elog_track;
int rv;
f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time;
u32 keep_trying = 1;
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);
if (PREDICT_FALSE (!is_vep))
}
if (PREDICT_FALSE (vep_next_sid == ~0))
{
- if (VPPCOM_DEBUG > 0)
+ if (VPPCOM_DEBUG > 1)
clib_warning ("VCL<%d>: WARNING: vep_idx (%u) is empty!",
getpid (), vep_idx);
- if (VPPCOM_DEBUG > 0)
+ if (VPPCOM_DEBUG > 1)
{
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
u32 data;
} *ed;
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_session->elog_track);
+ ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_elog_track);
ed->data = vep_idx;
/* *INDENT-ON* */
u32 sid;
u32 next_sid = ~0;
session_t *session;
+ elog_track_t session_elog_track;
for (sid = (wait_cont_idx == ~0) ? vep_next_sid : wait_cont_idx;
sid != ~0; sid = next_sid)
is_vep_session = session->is_vep_session;
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);
if (PREDICT_FALSE (is_vep))
u32 data;
} *ed;
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+ ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track);
ed->data = vep_idx;
/* *INDENT-ON* */
u32 data;
} *ed;
- ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+ ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track);
ed->data = sid;
/* *INDENT-ON* */
{
clib_warning ("VCL<%d>: ERROR: session (%u) "
"vep_idx (%u) != vep_idx (%u)!",
- getpid (), sid, session->vep.vep_idx, vep_idx);
+ getpid (), sid, session_vep_idx, vep_idx);
rv = VPPCOM_EINVAL;
goto done;
}
vppcom_endpt_t *ep = buffer;
VCL_LOCK_AND_GET_SESSION (session_index, &session);
+
+ ASSERT (session);
+
switch (op)
{
case VPPCOM_ATTR_GET_NREAD:
case VPPCOM_ATTR_GET_FLAGS:
if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*flags))))
{
- *flags = O_RDWR | ((session->is_nonblocking) ? O_NONBLOCK : 0);
+ *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, session->is_nonblocking);
+ session_index, *flags,
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_NONBLOCK));
if (VPPCOM_DEBUG > 0)
{
/* *INDENT-OFF* */
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
ed->flags = *flags;
- ed->is_nonblk = session->is_nonblocking;
+ ed->is_nonblk = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK);
/* *INDENT-ON* */
}
case VPPCOM_ATTR_SET_FLAGS:
if (PREDICT_TRUE (buffer && buflen && (*buflen == sizeof (*flags))))
{
- session->is_nonblocking = (*flags & O_NONBLOCK) ? 1 : 0;
+ if (*flags & O_NONBLOCK)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK);
+ 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,
- session->is_nonblocking);
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_NONBLOCK));
if (VPPCOM_DEBUG > 0)
{
/* *INDENT-OFF* */
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
ed->flags = *flags;
- ed->is_nonblk = session->is_nonblocking;
+ ed->is_nonblk = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK);
/* *INDENT-ON* */
}
}
};
CLIB_PACKED (struct {
i32 data;
- }) * ed;
+ }) *ed;
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
ed->data = session->libc_epfd;
case VPPCOM_ATTR_GET_TX_FIFO_LEN:
if (buffer && buflen && (*buflen >= sizeof (u32)))
{
- svm_fifo_t *tx_fifo;
-
- tx_fifo = ((!session->is_cut_thru || session->is_server) ?
- session->server_tx_fifo : session->server_rx_fifo);
/* VPP-TBD */
*(size_t *) buffer = (session->sndbuf_size ? session->sndbuf_size :
- tx_fifo ? tx_fifo->nitems :
+ session->tx_fifo ? session->tx_fifo->nitems :
vcm->cfg.tx_fifo_size);
*buflen = sizeof (u32);
case VPPCOM_ATTR_GET_RX_FIFO_LEN:
if (buffer && buflen && (*buflen >= sizeof (u32)))
{
- svm_fifo_t *rx_fifo;
-
- rx_fifo = ((!session->is_cut_thru || session->is_server) ?
- session->server_rx_fifo : session->server_tx_fifo);
/* VPP-TBD */
*(size_t *) buffer = (session->rcvbuf_size ? session->rcvbuf_size :
- rx_fifo ? rx_fifo->nitems :
+ session->rx_fifo ? session->rx_fifo->nitems :
vcm->cfg.rx_fifo_size);
*buflen = sizeof (u32);
}
}
- if (0)
+ if (0) // Note "done:" label used by VCL_LOCK_AND_GET_SESSION()
{
done:
*vp[i].revents = POLLNVAL;
Code Review / vpp.git / blobdiff