#include <socket.h>
#include <memif.h>
+#include <memif_private.h>
/* sends msg to socket */
static_fn int
static_fn int
memif_msg_enq_ack (memif_connection_t * c)
{
+ libmemif_main_t *lm = &libmemif_main;
memif_msg_queue_elt_t *e =
- (memif_msg_queue_elt_t *) malloc (sizeof (memif_msg_queue_elt_t));
+ (memif_msg_queue_elt_t *) lm->alloc (sizeof (memif_msg_queue_elt_t));
if (e == NULL)
return memif_syscall_error_handler (errno);
static_fn int
memif_msg_enq_init (memif_connection_t * c)
{
+ libmemif_main_t *lm = &libmemif_main;
memif_msg_queue_elt_t *e =
- (memif_msg_queue_elt_t *) malloc (sizeof (memif_msg_queue_elt_t));
+ (memif_msg_queue_elt_t *) lm->alloc (sizeof (memif_msg_queue_elt_t));
if (e == NULL)
return memif_syscall_error_handler (errno);
memset (e, 0, sizeof (memif_msg_queue_elt_t));
i->id = c->args.interface_id;
i->mode = c->args.mode;
- strncpy ((char *) i->name, (char *) c->args.instance_name,
- strlen ((char *) c->args.instance_name));
+ strncpy ((char *) i->name, (char *) lm->app_name,
+ strlen ((char *) lm->app_name));
if (c->args.secret)
strncpy ((char *) i->secret, (char *) c->args.secret, sizeof (i->secret));
static_fn int
memif_msg_enq_add_region (memif_connection_t * c, uint8_t region_index)
{
+ libmemif_main_t *lm = &libmemif_main;
/* maybe check if region is valid? */
memif_region_t *mr = &c->regions[region_index];
memif_msg_queue_elt_t *e =
- (memif_msg_queue_elt_t *) malloc (sizeof (memif_msg_queue_elt_t));
+ (memif_msg_queue_elt_t *) lm->alloc (sizeof (memif_msg_queue_elt_t));
if (e == NULL)
return memif_syscall_error_handler (errno);
static_fn int
memif_msg_enq_add_ring (memif_connection_t * c, uint8_t index, uint8_t dir)
{
+ libmemif_main_t *lm = &libmemif_main;
memif_msg_queue_elt_t *e =
- (memif_msg_queue_elt_t *) malloc (sizeof (memif_msg_queue_elt_t));
+ (memif_msg_queue_elt_t *) lm->alloc (sizeof (memif_msg_queue_elt_t));
if (e == NULL)
return memif_syscall_error_handler (errno);
ar->region = mq->region;
ar->log2_ring_size = mq->log2_ring_size;
ar->flags = (dir == MEMIF_RING_S2M) ? MEMIF_MSG_ADD_RING_FLAG_S2M : 0;
+ ar->private_hdr_size = 0;
e->next = NULL;
if (c->msg_queue == NULL)
static_fn int
memif_msg_enq_connect (memif_connection_t * c)
{
+ libmemif_main_t *lm = &libmemif_main;
memif_msg_queue_elt_t *e =
- (memif_msg_queue_elt_t *) malloc (sizeof (memif_msg_queue_elt_t));
+ (memif_msg_queue_elt_t *) lm->alloc (sizeof (memif_msg_queue_elt_t));
if (e == NULL)
return memif_syscall_error_handler (errno);
static_fn int
memif_msg_enq_connected (memif_connection_t * c)
{
+ libmemif_main_t *lm = &libmemif_main;
memif_msg_queue_elt_t *e =
- (memif_msg_queue_elt_t *) malloc (sizeof (memif_msg_queue_elt_t));
+ (memif_msg_queue_elt_t *) lm->alloc (sizeof (memif_msg_queue_elt_t));
if (e == NULL)
return memif_syscall_error_handler (errno);
if (fd < 0)
return MEMIF_ERR_NO_INTFD;
+ if (ar->private_hdr_size != 0)
+ return MEMIF_ERR_PRIVHDR;
+
if (ar->flags & MEMIF_MSG_ADD_RING_FLAG_S2M)
{
if (ar->index > MEMIF_MAX_S2M_RING)
mq =
(memif_queue_t *) realloc (c->rx_queues,
sizeof (memif_queue_t) * (ar->index + 1));
+ memset (mq, 0, sizeof (memif_queue_t) * (ar->index + 1));
if (mq == NULL)
return memif_syscall_error_handler (errno);
c->rx_queues = mq;
mq =
(memif_queue_t *) realloc (c->tx_queues,
sizeof (memif_queue_t) * (ar->index + 1));
+ memset (mq, 0, sizeof (memif_queue_t) * (ar->index + 1));
if (mq == NULL)
return memif_syscall_error_handler (errno);
c->tx_queues = mq;
add_list_elt (&elt, &lm->interrupt_list, &lm->interrupt_list_len);
lm->control_fd_update (c->rx_queues[i].int_fd, MEMIF_FD_EVENT_READ);
+
+ /* refill ring buffers */
+ memif_refill_queue ((void *) c, i, -1);
}
}
if (c->on_interrupt != NULL)
{
for (i = 0; i < c->run_args.num_s2m_rings; i++)
- lm->control_fd_update (c->rx_queues[i].int_fd, MEMIF_FD_EVENT_READ);
+ {
+ lm->control_fd_update (c->rx_queues[i].int_fd, MEMIF_FD_EVENT_READ);
+
+ /* refill ring buffers */
+ memif_refill_queue ((void *) c, i, -1);
+ }
}
c->on_connect ((void *) c, c->private_ctx);
int
memif_conn_fd_write_ready (memif_connection_t * c)
{
+ libmemif_main_t *lm = &libmemif_main;
int err = MEMIF_ERR_SUCCESS; /* 0 */
MEMIF_FD_EVENT_READ | MEMIF_FD_EVENT_WRITE | MEMIF_FD_EVENT_MOD);
*/
err = memif_msg_send (c->fd, &e->msg, e->fd);
- free (e);
+ lm->free (e);
goto done;
done: