{
vl_api_registration_t *reg;
socket_main_t *sm = &socket_main;
- clib_file_main_t *fm = &file_main;
clib_file_t *f;
/*
pool_foreach (reg, sm->registration_pool,
({
if (reg->registration_type == REGISTRATION_TYPE_SOCKET_SERVER) {
- f = pool_elt_at_index (fm->file_pool, reg->clib_file_index);
- vlib_cli_output (vm, "%20s %8d",
- reg->name, f->file_descriptor);
+ f = vl_api_registration_file (reg);
+ vlib_cli_output (vm, "%20s %8d", reg->name, f->file_descriptor);
}
}));
/* *INDENT-ON* */
u16 msg_id = ntohs (*(u16 *) elem);
api_main_t *am = &api_main;
msgbuf_t *mb = (msgbuf_t *) (elem - offsetof (msgbuf_t, data));
- clib_file_t *cf = clib_file_get (&file_main, rp->clib_file_index);
vl_api_registration_t *sock_rp;
+ clib_file_t *cf;
+ cf = vl_api_registration_file (rp);
ASSERT (rp->registration_type > REGISTRATION_TYPE_SHMEM);
if (msg_id >= vec_len (am->api_trace_cfg))
clib_error_t *error;
error = clib_socket_accept (sock, &client);
-
if (error)
return error;
vl_api_send_msg (regp, (u8 *) rp);
- clib_file_del (&file_main, file_main.file_pool + regp->clib_file_index);
-
+ vl_api_registration_del_file (regp);
vl_socket_free_registration_index (mp->index);
}
else
}
}
-static clib_error_t *
-send_fd_msg (int socket_fd, int fd_to_share)
+clib_error_t *
+vl_sock_api_send_fd_msg (int socket_fd, int fd_to_share)
{
struct msghdr mh = { 0 };
struct iovec iov[1];
if (!mp->nitems)
{
- vec_validate (config, 3);
+ vec_validate (config, 6);
config[0].type = VL_API_VLIB_RING;
- config[0].count = 128;
config[0].size = 256;
- config[1].type = VL_API_CLIENT_RING;
- config[1].count = 128;
+ config[0].count = 32;
+
+ config[1].type = VL_API_VLIB_RING;
config[1].size = 1024;
- config[2].type = VL_API_CLIENT_RING;
- config[2].count = 8;
+ config[1].count = 16;
+
+ config[2].type = VL_API_VLIB_RING;
config[2].size = 4096;
- config[3].type = VL_API_QUEUE;
- config[3].count = 128;
- config[3].size = sizeof (uword);
+ config[2].count = 2;
+
+ config[3].type = VL_API_CLIENT_RING;
+ config[3].size = 256;
+ config[3].count = 32;
+
+ config[4].type = VL_API_CLIENT_RING;
+ config[4].size = 1024;
+ config[4].count = 16;
+
+ config[5].type = VL_API_CLIENT_RING;
+ config[5].size = 4096;
+ config[5].count = 2;
+
+ config[6].type = VL_API_QUEUE;
+ config[6].count = 128;
+ config[6].size = sizeof (uword);
}
else
{
svm_region_t *vlib_rp;
clib_file_t *cf;
vl_api_shm_elem_config_t *config = 0;
+ vl_shmem_hdr_t *shmem_hdr;
int rv;
regp = vl_api_client_index_to_registration (mp->client_index);
memfd->i_am_master = 1;
memfd->name = format (0, "%s%c", regp->name, 0);
- if ((rv = ssvm_master_init_memfd (memfd, mp->client_index)))
+ if ((rv = ssvm_master_init_memfd (memfd)))
goto reply;
/* Remember to close this fd when the socket connection goes away */
vlib_rp = (svm_region_t *) a->baseva;
vl_init_shmem (vlib_rp, config, 1 /* is_vlib (dont-care) */ ,
1 /* is_private */ );
+
+ /* Remember who created this. Needs to be post vl_init_shmem */
+ shmem_hdr = (vl_shmem_hdr_t *) vlib_rp->user_ctx;
+ shmem_hdr->clib_file_index = vl_api_registration_file_index (regp);
+
vec_add1 (am->vlib_private_rps, vlib_rp);
memfd->sh->ready = 1;
vec_free (config);
* We need the reply message to make it out the back door
* before we send the magic fd message so force a flush
*/
- cf = clib_file_get (&file_main, regp->clib_file_index);
+ cf = vl_api_registration_file (regp);
cf->write_function (cf);
/* Send the magic "here's your sign (aka fd)" socket message */
- send_fd_msg (cf->file_descriptor, memfd->fd);
-}
-
-/*
- * Create a memory-fd segment.
- */
-void
-vl_api_memfd_segment_create_t_handler (vl_api_memfd_segment_create_t * mp)
-{
- vl_api_memfd_segment_create_reply_t *rmp;
- clib_file_t *cf;
- ssvm_private_t _memfd_private, *memfd = &_memfd_private;
- vl_api_registration_t *regp;
- int rv;
-
- regp = vl_api_client_index_to_registration (mp->client_index);
- if (regp == 0)
- {
- clib_warning ("API client disconnected");
- return;
- }
-
- memset (memfd, 0, sizeof (*memfd));
- memfd->ssvm_size = mp->requested_size;
- memfd->requested_va = 0ULL;
- memfd->i_am_master = 1;
- memfd->name = format (0, "%s%c", regp->name, 0);
-
- /* Set up a memfd segment of the requested size */
- if ((rv = ssvm_master_init_memfd (memfd, mp->client_index)))
- goto reply;
-
- /* Remember to close this fd when the socket connection goes away */
- vec_add1 (regp->additional_fds_to_close, memfd->fd);
-
-reply:
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- rmp->_vl_msg_id = htons (VL_API_MEMFD_SEGMENT_CREATE_REPLY);
- rmp->context = mp->context;
- rmp->retval = htonl (rv);
-
- vl_api_send_msg (regp, (u8 *) rmp);
-
- if (rv != 0)
- return;
-
- /*
- * We need the reply message to make it out the back door
- * before we send the magic fd message.
- */
- cf = file_main.file_pool + regp->clib_file_index;
- cf->write_function (cf);
-
- /* send the magic "here's your sign (aka fd)" socket message */
- send_fd_msg (cf->file_descriptor, memfd->fd);
+ vl_sock_api_send_fd_msg (cf->file_descriptor, memfd->fd);
}
#define foreach_vlib_api_msg \
_(SOCKCLNT_CREATE, sockclnt_create) \
_(SOCKCLNT_DELETE, sockclnt_delete) \
-_(SOCK_INIT_SHM, sock_init_shm) \
-_(MEMFD_SEGMENT_CREATE, memfd_segment_create)
+_(SOCK_INIT_SHM, sock_init_shm)
clib_error_t *
vl_sock_api_init (vlib_main_t * vm)
static clib_error_t *
socket_exit (vlib_main_t * vm)
{
- clib_file_main_t *fm = &file_main;
socket_main_t *sm = &socket_main;
vl_api_registration_t *rp;
u32 index;
/* *INDENT-OFF* */
pool_foreach (rp, sm->registration_pool, ({
- clib_file_del (fm, fm->file_pool + rp->clib_file_index);
- index = rp->vl_api_registration_pool_index;
- vl_socket_free_registration_index (index);
+ vl_api_registration_del_file (rp);
+ index = rp->vl_api_registration_pool_index;
+ vl_socket_free_registration_index (index);
}));
/* *INDENT-ON* */
}
Code Review / vpp.git / blobdiff