{
if (is_server)
{
- svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
svm_fifo_segment_private_t *seg;
VCL_LOCK_AND_GET_SESSION (session_index, &session);
session->server_tx_fifo,
session->server_tx_fifo->refcnt);
- seg = vec_elt_at_index (sm->segments, session->sm_seg_index);
+ 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,
clib_time_init (&vcm->clib_time);
vppcom_init_error_string_table ();
- svm_fifo_segment_init (vcl_cfg->segment_baseva,
- 20 /* timeout in secs */ );
+ svm_fifo_segment_main_init (vcl_cfg->segment_baseva,
+ 20 /* timeout in secs */ );
clib_spinlock_init (&vcm->sessions_lockp);
}
{
session_t *listen_session = 0;
session_t *client_session = 0;
- u32 client_session_index = ~0;
+ u32 client_session_index = ~0, n_fifos;
int rv;
f64 wait_for;
char *cut_thru_str;
format ((u8 *) a->segment_name, "%d:segment%d%c",
getpid (), vcm->unique_segment_index++, 0);
a->segment_size = vcm->cfg.segment_size;
- a->preallocated_fifo_pairs = vcm->cfg.preallocated_fifo_pairs;
- a->rx_fifo_size = vcm->cfg.rx_fifo_size;
- a->tx_fifo_size = vcm->cfg.tx_fifo_size;
rv = svm_fifo_segment_create (a);
if (PREDICT_FALSE (rv))
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);
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
- .format = "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd=%s%d buflen=%d",
- .format_args = "t1i4i4",
- .n_enum_strings = 2,
- .enum_strings = {"", "-",},
+ .format = "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd=%d",
+ .format_args = "i4",
};
CLIB_PACKED (struct {
- u8 sign;
- u32 data[2];
+ i32 data;
}) * 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;
+ ed->data = session->libc_epfd;
/* *INDENT-ON* */
}
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
"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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
}
else
rv = VPPCOM_EINVAL;
session->user_mss = *(u32 *) buffer;
if (VPPCOM_DEBUG > 2)
- clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %u, "
+ 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* */
+ }
}
else
rv = VPPCOM_EINVAL;
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* */
+ }
rv = VPPCOM_EBADFD;
clib_spinlock_unlock (&vcm->sessions_lockp);
goto done;
Code Review / vpp.git / blobdiff