Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VCL: remove vrf from vppcom api.
[vpp.git]
/
src
/
vcl
/
vppcom.c
diff --git
a/src/vcl/vppcom.c
b/src/vcl/vppcom.c
index
29e5a10
..
7edb69c
100644
(file)
--- a/
src/vcl/vppcom.c
+++ b/
src/vcl/vppcom.c
@@
-157,7
+157,6
@@
typedef struct
u32 wait_cont_idx;
vppcom_epoll_t vep;
int libc_epfd;
u32 wait_cont_idx;
vppcom_epoll_t vep;
int libc_epfd;
- u32 vrf;
vppcom_ip46_t lcl_addr;
vppcom_ip46_t peer_addr;
u16 lcl_port; // network order
vppcom_ip46_t lcl_addr;
vppcom_ip46_t peer_addr;
u16 lcl_port; // network order
@@
-1043,7
+1042,6
@@
vppcom_send_connect_sock (session_t * session, u32 session_index)
cmp->client_index = vcm->my_client_index;
cmp->context = session_index;
cmp->client_index = vcm->my_client_index;
cmp->context = session_index;
- cmp->vrf = session->vrf;
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->is_ip4 = session->peer_addr.is_ip4;
clib_memcpy (cmp->ip, &session->peer_addr.ip46, sizeof (cmp->ip));
cmp->port = session->peer_port;
@@
-1488,7
+1486,6
@@
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->_vl_msg_id = ntohs (VL_API_BIND_SOCK);
bmp->client_index = vcm->my_client_index;
bmp->context = session_index;
- bmp->vrf = session->vrf;
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->is_ip4 = session->lcl_addr.is_ip4;
clib_memcpy (bmp->ip, &session->lcl_addr.ip46, sizeof (bmp->ip));
bmp->port = session->lcl_port;
@@
-2304,8
+2301,8
@@
vppcom_app_create (char *app_name)
clib_time_init (&vcm->clib_time);
vppcom_init_error_string_table ();
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);
}
clib_spinlock_init (&vcm->sessions_lockp);
}
@@
-2402,7
+2399,7
@@
vppcom_app_destroy (void)
}
int
}
int
-vppcom_session_create (u
32 vrf, u
8 proto, u8 is_nonblocking)
+vppcom_session_create (u8 proto, u8 is_nonblocking)
{
session_t *session;
u32 session_index;
{
session_t *session;
u32 session_index;
@@
-2412,7
+2409,6
@@
vppcom_session_create (u32 vrf, u8 proto, u8 is_nonblocking)
memset (session, 0, sizeof (*session));
session_index = session - vcm->sessions;
memset (session, 0, sizeof (*session));
session_index = session - vcm->sessions;
- session->vrf = vrf;
session->proto = proto;
session->state = STATE_START;
session->is_nonblocking = is_nonblocking ? 1 : 0;
session->proto = proto;
session->state = STATE_START;
session->is_nonblocking = is_nonblocking ? 1 : 0;
@@
-2432,20
+2428,19
@@
vppcom_session_create (u32 vrf, u8 proto, u8 is_nonblocking)
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
- .format = "session_create:
vrf:%d
proto:%d state:%d is_nonblocking:%d",
- .format_args = "i4i4i4
i4
",
+ .format = "session_create:proto:%d state:%d is_nonblocking:%d",
+ .format_args = "i4i4i4",
};
struct
{
};
struct
{
- u32 data[
4
];
+ u32 data[
3
];
} *ed;
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
} *ed;
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
- ed->data[0] = session->vrf;
- ed->data[1] = session->proto;
- ed->data[2] = session->state;
- ed->data[3] = session->is_nonblocking;
+ ed->data[0] = session->proto;
+ ed->data[1] = session->state;
+ ed->data[2] = session->is_nonblocking;
/* *INDENT-ON* */
}
/* *INDENT-ON* */
}
@@
-2607,7
+2602,6
@@
vppcom_session_bind (uint32_t session_index, vppcom_endpt_t * ep)
goto done;
}
goto done;
}
- session->vrf = ep->vrf;
session->lcl_addr.is_ip4 = ep->is_ip4;
session->lcl_addr.ip46 = to_ip46 (!ep->is_ip4, ep->ip);
session->lcl_port = ep->port;
session->lcl_addr.is_ip4 = ep->is_ip4;
session->lcl_addr.ip46 = to_ip46 (!ep->is_ip4, ep->ip);
session->lcl_port = ep->port;
@@
-2722,7
+2716,7
@@
vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep,
{
session_t *listen_session = 0;
session_t *client_session = 0;
{
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;
int rv;
f64 wait_for;
char *cut_thru_str;
@@
-2795,7
+2789,6
@@
vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep,
if (ep)
{
if (ep)
{
- ep->vrf = client_session->vrf;
ep->is_cut_thru = client_session->is_cut_thru;
ep->is_ip4 = client_session->peer_addr.is_ip4;
ep->port = client_session->peer_port;
ep->is_cut_thru = client_session->is_cut_thru;
ep->is_ip4 = client_session->peer_addr.is_ip4;
ep->port = client_session->peer_port;
@@
-2821,9
+2814,6
@@
vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep,
format ((u8 *) a->segment_name, "%d:segment%d%c",
getpid (), vcm->unique_segment_index++, 0);
a->segment_size = vcm->cfg.segment_size;
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))
rv = svm_fifo_segment_create (a);
if (PREDICT_FALSE (rv))
@@
-2850,6
+2840,14
@@
vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep,
vec_free (a->new_segment_indices);
seg = svm_fifo_segment_get_segment (client_session->sm_seg_index);
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);
client_session->server_rx_fifo =
svm_fifo_segment_alloc_fifo (seg, vcm->cfg.rx_fifo_size,
FIFO_SEGMENT_RX_FREELIST);
@@
-3049,7
+3047,6
@@
vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep)
goto done;
}
goto done;
}
- session->vrf = server_ep->vrf;
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;
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;
@@
-4418,7
+4415,6
@@
vppcom_session_attr (uint32_t session_index, uint32_t op,
if (PREDICT_TRUE (buffer && buflen &&
(*buflen >= sizeof (*ep)) && ep->ip))
{
if (PREDICT_TRUE (buffer && buflen &&
(*buflen >= sizeof (*ep)) && ep->ip))
{
- ep->vrf = session->vrf;
ep->is_ip4 = session->peer_addr.is_ip4;
ep->port = session->peer_port;
if (session->peer_addr.is_ip4)
ep->is_ip4 = session->peer_addr.is_ip4;
ep->port = session->peer_port;
if (session->peer_addr.is_ip4)
@@
-4485,7
+4481,6
@@
vppcom_session_attr (uint32_t session_index, uint32_t op,
if (PREDICT_TRUE (buffer && buflen &&
(*buflen >= sizeof (*ep)) && ep->ip))
{
if (PREDICT_TRUE (buffer && buflen &&
(*buflen >= sizeof (*ep)) && ep->ip))
{
- ep->vrf = session->vrf;
ep->is_ip4 = session->lcl_addr.is_ip4;
ep->port = session->lcl_port;
if (session->lcl_addr.is_ip4)
ep->is_ip4 = session->lcl_addr.is_ip4;
ep->port = session->lcl_port;
if (session->lcl_addr.is_ip4)
@@
-4558,21
+4553,15
@@
vppcom_session_attr (uint32_t session_index, uint32_t op,
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
/* *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 {
};
CLIB_PACKED (struct {
- u8 sign;
- u32 data[2];
+ i32 data;
}) * ed;
ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
}) * 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* */
}
/* *INDENT-ON* */
}
@@
-4839,7
+4828,7
@@
vppcom_session_attr (uint32_t session_index, uint32_t op,
/* VPP-TBD */
session->rcvbuf_size = *(u32 *) buffer;
if (VPPCOM_DEBUG > 2)
/* VPP-TBD */
session->rcvbuf_size = *(u32 *) buffer;
if (VPPCOM_DEBUG > 2)
- clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_
T
X_FIFO_LEN: %u (0x%x), "
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_
R
X_FIFO_LEN: %u (0x%x), "
"buflen %d, #VPP-TBD#", getpid (),
session->sndbuf_size, session->sndbuf_size,
*buflen);
"buflen %d, #VPP-TBD#", getpid (),
session->sndbuf_size, session->sndbuf_size,
*buflen);
@@
-4848,7
+4837,7
@@
vppcom_session_attr (uint32_t session_index, uint32_t op,
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
/* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
- .format = "VPPCOM_ATTR_SET_
T
X_FIFO_LEN: 0x%x buflen=%d",
+ .format = "VPPCOM_ATTR_SET_
R
X_FIFO_LEN: 0x%x buflen=%d",
.format_args = "i4i4",
};
.format_args = "i4i4",
};
@@
-5575,7
+5564,6
@@
vppcom_session_recvfrom (uint32_t session_index, void *buffer,
clib_spinlock_unlock (&vcm->sessions_lockp);
goto done;
}
clib_spinlock_unlock (&vcm->sessions_lockp);
goto done;
}
- ep->vrf = session->vrf;
ep->is_ip4 = session->peer_addr.is_ip4;
ep->port = session->peer_port;
if (session->peer_addr.is_ip4)
ep->is_ip4 = session->peer_addr.is_ip4;
ep->port = session->peer_port;
if (session->peer_addr.is_ip4)