/* private structs and functions */
#include <memif_private.h>
-#define ERRLIST_LEN 37
+#define ERRLIST_LEN 38
#define MAX_ERRBUF_LEN 256
#if __x86_x64__
/* MEMIF_ERR_UNKNOWN_MSG */
"Unknown message type received on control channel. (internal error)",
/* MEMIF_ERR_POLL_CANCEL */
- "Memif event polling was canceled."
+ "Memif event polling was canceled.",
+ /* MEMIF_ERR_MAX_RING */
+ "Maximum log2 ring size is 15"
};
#define MEMIF_ERR_UNDEFINED "undefined error"
return MEMIF_ERR_PROC_FILE_LIMIT;
if (err_code == ENOMEM)
return MEMIF_ERR_NOMEM;
-/* connection refused if master dows not exist
+/* connection refused if master does not exist
this error would spam the user until master was created */
if (err_code == ECONNREFUSED)
return MEMIF_ERR_SUCCESS;
{
int err = MEMIF_ERR_SUCCESS; /* 0 */
libmemif_main_t *lm = &libmemif_main;
+ memset (lm, 0, sizeof (libmemif_main_t));
if (app_name)
{
- lm->app_name = malloc (strlen (app_name) + sizeof (char));
- memset (lm->app_name, 0, strlen (app_name) + sizeof (char));
+ uint8_t len = (strlen (app_name) < MEMIF_NAME_LEN)
+ ? MEMIF_NAME_LEN : strlen (app_name);
strncpy ((char *) lm->app_name, app_name, strlen (app_name));
}
else
{
- lm->app_name = malloc (strlen (MEMIF_DEFAULT_APP_NAME) + sizeof (char));
- memset (lm->app_name, 0, strlen (app_name) + sizeof (char));
strncpy ((char *) lm->app_name, MEMIF_DEFAULT_APP_NAME,
strlen (MEMIF_DEFAULT_APP_NAME));
}
DBG ("libmemif event polling initialized");
}
- memset (&lm->ms, 0, sizeof (memif_socket_t));
-
lm->control_list_len = 2;
lm->interrupt_list_len = 2;
lm->listener_list_len = 1;
lm->arm.it_value.tv_nsec = 0;
lm->arm.it_interval.tv_sec = 2;
lm->arm.it_interval.tv_nsec = 0;
- memset (&lm->disarm, 0, sizeof (lm->disarm));
if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ) < 0)
{
if (conn == NULL)
return MEMIF_ERR_NOCONN;
uint8_t num =
- (conn->args.is_master) ? conn->run_args.num_s2m_rings : conn->run_args.
- num_m2s_rings;
+ (conn->args.is_master) ? conn->run_args.num_s2m_rings : conn->
+ run_args.num_m2s_rings;
if (qid >= num)
return MEMIF_ERR_QID;
if (args->log2_ring_size == 0)
args->log2_ring_size = MEMIF_DEFAULT_LOG2_RING_SIZE;
+ else if (args->log2_ring_size > MEMIF_MAX_LOG2_RING_SIZE)
+ {
+ err = MEMIF_ERR_MAX_RING;
+ goto error;
+ }
if (args->buffer_size == 0)
args->buffer_size = MEMIF_DEFAULT_BUFFER_SIZE;
if (args->num_s2m_rings == 0)
if (((memif_connection_t *) e->data_struct)->on_interrupt != NULL)
{
num =
- (((memif_connection_t *) e->data_struct)->args.
- is_master) ? ((memif_connection_t *) e->data_struct)->
- run_args.num_s2m_rings : ((memif_connection_t *) e->
- data_struct)->run_args.
- num_m2s_rings;
+ (((memif_connection_t *) e->data_struct)->
+ args.is_master) ? ((memif_connection_t *) e->
+ data_struct)->run_args.
+ num_s2m_rings : ((memif_connection_t *) e->data_struct)->
+ run_args.num_m2s_rings;
for (i = 0; i < num; i++)
{
- if (((memif_connection_t *) e->data_struct)->rx_queues[i].
- int_fd == fd)
+ if (((memif_connection_t *) e->data_struct)->
+ rx_queues[i].int_fd == fd)
{
- ((memif_connection_t *) e->
- data_struct)->on_interrupt ((void *) e->data_struct,
- ((memif_connection_t *)
- e->data_struct)->
- private_ctx, i);
+ ((memif_connection_t *) e->data_struct)->
+ on_interrupt ((void *) e->data_struct,
+ ((memif_connection_t *) e->
+ data_struct)->private_ctx, i);
return MEMIF_ERR_SUCCESS;
}
}
if (events & MEMIF_FD_EVENT_READ)
{
err =
- ((memif_connection_t *) e->data_struct)->read_fn (e->
- data_struct);
+ ((memif_connection_t *) e->data_struct)->
+ read_fn (e->data_struct);
if (err != MEMIF_ERR_SUCCESS)
return err;
}
if (events & MEMIF_FD_EVENT_WRITE)
{
err =
- ((memif_connection_t *) e->data_struct)->write_fn (e->
- data_struct);
+ ((memif_connection_t *) e->data_struct)->
+ write_fn (e->data_struct);
if (err != MEMIF_ERR_SUCCESS)
return err;
}
if (events & MEMIF_FD_EVENT_ERROR)
{
err =
- ((memif_connection_t *) e->data_struct)->error_fn (e->
- data_struct);
+ ((memif_connection_t *) e->data_struct)->
+ error_fn (e->data_struct);
if (err != MEMIF_ERR_SUCCESS)
return err;
}
if (c->tx_queues != NULL)
{
num =
- (c->args.is_master) ? c->run_args.num_m2s_rings : c->run_args.
- num_s2m_rings;
+ (c->args.is_master) ? c->run_args.num_m2s_rings : c->
+ run_args.num_s2m_rings;
for (i = 0; i < num; i++)
{
mq = &c->tx_queues[i];
if (c->rx_queues != NULL)
{
num =
- (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args.
- num_m2s_rings;
+ (c->args.is_master) ? c->run_args.num_s2m_rings : c->
+ run_args.num_m2s_rings;
for (i = 0; i < num; i++)
{
mq = &c->rx_queues[i];
}
num =
- (c->args.is_master) ? c->run_args.num_m2s_rings : c->run_args.
- num_s2m_rings;
+ (c->args.is_master) ? c->run_args.num_m2s_rings : c->
+ run_args.num_s2m_rings;
for (i = 0; i < num; i++)
{
mq = &c->tx_queues[i];
}
}
num =
- (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args.
- num_m2s_rings;
+ (c->args.is_master) ? c->run_args.num_s2m_rings : c->
+ run_args.num_m2s_rings;
for (i = 0; i < num; i++)
{
mq = &c->rx_queues[i];
if (c->fd < 0)
return MEMIF_ERR_DISCONNECTED;
uint8_t num =
- (c->args.is_master) ? c->run_args.num_m2s_rings : c->run_args.
- num_s2m_rings;
+ (c->args.is_master) ? c->run_args.num_m2s_rings : c->
+ run_args.num_s2m_rings;
if (qid >= num)
return MEMIF_ERR_QID;
memif_queue_t *mq = &c->tx_queues[qid];
memif_ring_t *ring = mq->ring;
memif_buffer_t *b0, *b1;
- uint8_t chain_buf0, chain_buf1;
+ uint8_t chain_buf = 1;
uint16_t mask = (1 << mq->log2_ring_size) - 1;
+ uint16_t head = ring->head;
+ uint16_t tail = ring->tail;
+ uint16_t ring_size;
uint16_t s0, s1, ns;
*count_out = 0;
int i, err = MEMIF_ERR_SUCCESS; /* 0 */
- if (ring->tail != ring->head)
+ ring_size = (1 << mq->log2_ring_size);
+ ns = ring_size - head + tail;
+
+ /* calculate number of chain buffers */
+ if (size > ring->desc[0].buffer_length)
{
- if (ring->head > ring->tail)
- ns = (1 << mq->log2_ring_size) - ring->head + ring->tail;
- else
- ns = ring->tail - ring->head;
+ chain_buf = size / ring->desc[0].buffer_length;
+ if (((size % ring->desc[0].buffer_length) != 0) || (size == 0))
+ chain_buf++;
}
- else
- ns = (1 << mq->log2_ring_size);
-
- /* (head == tail) ? receive function will asume that no packets are available */
- ns -= 1;
while (count && ns)
{
while ((count > 2) && (ns > 2))
{
s0 = (ring->head + mq->alloc_bufs) & mask;
- chain_buf0 = size / ring->desc[s0].buffer_length;
- if (((size % ring->desc[s0].buffer_length) != 0) || (size == 0))
- chain_buf0++;
-
- if (chain_buf0 > ns)
- break;
-
- s1 = (ring->head + mq->alloc_bufs + chain_buf0) & mask;
- chain_buf1 = size / ring->desc[s1].buffer_length;
- if (((size % ring->desc[s1].buffer_length) != 0) || (size == 0))
- chain_buf1++;
+ s1 = (ring->head + mq->alloc_bufs + chain_buf) & mask;
- if ((chain_buf0 + chain_buf1) > ns)
+ if ((2 * chain_buf) > ns)
break;
b0 = (bufs + *count_out);
b1 = (bufs + *count_out + 1);
- b0->desc_index = s0;
- b1->desc_index = s1;
+ b0->desc_index = head + mq->alloc_bufs;
+ b1->desc_index = head + mq->alloc_bufs + chain_buf;
ring->desc[s0].flags = 0;
ring->desc[s1].flags = 0;
- b0->buffer_len = ring->desc[s0].buffer_length * chain_buf0;
- b1->buffer_len = ring->desc[s1].buffer_length * chain_buf1;
+ b0->buffer_len = ring->desc[s0].buffer_length * chain_buf;
+ b1->buffer_len = ring->desc[s1].buffer_length * chain_buf;
/* TODO: support multiple regions -> ring descriptor contains region index */
b0->data = c->regions->shm + ring->desc[s0].offset;
b1->data = c->regions->shm + ring->desc[s1].offset;
- for (i = 0; i < (memif_min (chain_buf0, chain_buf1) - 1); i++)
+ for (i = 0; i < (chain_buf - 1); i++)
{
ring->desc[(s0 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT;
ring->desc[(s1 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT;
DBG ("allocating chained buffers");
}
- if (chain_buf0 > chain_buf1)
- {
- for (; i < (chain_buf0 - 1); i++)
- ring->desc[(s0 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT;
- }
- else
- {
- for (; i < (chain_buf1 - 1); i++)
- ring->desc[(s1 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT;
- }
-
- mq->alloc_bufs += chain_buf0 + chain_buf1;
+ mq->alloc_bufs += 2 * chain_buf;
DBG ("allocated ring slots %u, %u", s0, s1);
count -= 2;
- ns -= chain_buf0 + chain_buf1;
+ ns -= (2 * chain_buf);
*count_out += 2;
}
s0 = (ring->head + mq->alloc_bufs) & mask;
b0 = (bufs + *count_out);
- chain_buf0 = size / ring->desc[s0].buffer_length;
- if (((size % ring->desc[s0].buffer_length) != 0) || (size == 0))
- chain_buf0++;
-
- if (chain_buf0 > ns)
+ if (chain_buf > ns)
break;
- b0->desc_index = s0;
+ b0->desc_index = head + mq->alloc_bufs;
ring->desc[s0].flags = 0;
- b0->buffer_len = ring->desc[s0].buffer_length * chain_buf0;
+ b0->buffer_len = ring->desc[s0].buffer_length * chain_buf;
b0->data = c->regions->shm + ring->desc[s0].offset;
- for (i = 0; i < (chain_buf0 - 1); i++)
+ for (i = 0; i < (chain_buf - 1); i++)
{
ring->desc[(s0 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT;
DBG ("allocating chained buffers");
}
- mq->alloc_bufs += chain_buf0;
+ mq->alloc_bufs += chain_buf;
DBG ("allocated ring slot %u", s0);
count--;
- ns -= chain_buf0;
+ ns -= chain_buf;
*count_out += 1;
}
if (c->fd < 0)
return MEMIF_ERR_DISCONNECTED;
uint8_t num =
- (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args.
- num_m2s_rings;
+ (c->args.is_master) ? c->run_args.num_s2m_rings : c->
+ run_args.num_m2s_rings;
if (qid >= num)
return MEMIF_ERR_QID;
libmemif_main_t *lm = &libmemif_main;
b0 = (bufs + *count_out);
b1 = (bufs + *count_out + 1);
chain_buf0 =
- b0->buffer_len / ring->desc[b0->desc_index].buffer_length;
- if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) !=
- 0)
+ b0->buffer_len / ring->desc[b0->desc_index & mask].buffer_length;
+ if ((b0->buffer_len %
+ ring->desc[b0->desc_index & mask].buffer_length) != 0)
chain_buf0++;
chain_buf1 =
- b1->buffer_len / ring->desc[b1->desc_index].buffer_length;
- if ((b1->buffer_len % ring->desc[b1->desc_index].buffer_length) !=
- 0)
+ b1->buffer_len / ring->desc[b1->desc_index & mask].buffer_length;
+ if ((b1->buffer_len %
+ ring->desc[b1->desc_index & mask].buffer_length) != 0)
chain_buf1++;
- tail = (b1->desc_index + chain_buf1) & mask;
+ tail = b1->desc_index + chain_buf1;
b0->data = NULL;
b1->data = NULL;
mq->alloc_bufs -= chain_buf0 + chain_buf1;
}
b0 = (bufs + *count_out);
- chain_buf0 = b0->buffer_len / ring->desc[b0->desc_index].buffer_length;
- if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) != 0)
+ chain_buf0 =
+ b0->buffer_len / ring->desc[b0->desc_index & mask].buffer_length;
+ if ((b0->buffer_len %
+ ring->desc[b0->desc_index & mask].buffer_length) != 0)
chain_buf0++;
- tail = (b0->desc_index + chain_buf0) & mask;
+ tail = b0->desc_index + chain_buf0;
b0->data = NULL;
count--;
if (c->fd < 0)
return MEMIF_ERR_DISCONNECTED;
uint8_t num =
- (c->args.is_master) ? c->run_args.num_m2s_rings : c->run_args.
- num_s2m_rings;
+ (c->args.is_master) ? c->run_args.num_m2s_rings : c->
+ run_args.num_s2m_rings;
if (qid >= num)
return MEMIF_ERR_QID;
memif_queue_t *mq = &c->tx_queues[qid];
b0 = (bufs + curr_buf);
b1 = (bufs + curr_buf + 1);
chain_buf0 =
- b0->buffer_len / ring->desc[b0->desc_index].buffer_length;
- if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) !=
- 0)
+ b0->buffer_len / ring->desc[b0->desc_index & mask].buffer_length;
+ if ((b0->buffer_len %
+ ring->desc[b0->desc_index & mask].buffer_length) != 0)
chain_buf0++;
chain_buf1 =
- b1->buffer_len / ring->desc[b1->desc_index].buffer_length;
- if ((b1->buffer_len % ring->desc[b1->desc_index].buffer_length) !=
- 0)
+ b1->buffer_len / ring->desc[b1->desc_index & mask].buffer_length;
+ if ((b1->buffer_len %
+ ring->desc[b1->desc_index & mask].buffer_length) != 0)
chain_buf1++;
for (i = 0; i < memif_min (chain_buf0, chain_buf1); i++)
}
}
- head = (b1->desc_index + chain_buf1) & mask;
+ head = b1->desc_index + chain_buf1;
b0->data = NULL;
#ifdef MEMIF_DBG
}
b0 = (bufs + curr_buf);
- chain_buf0 = b0->buffer_len / ring->desc[b0->desc_index].buffer_length;
- if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) != 0)
+ chain_buf0 =
+ b0->buffer_len / ring->desc[b0->desc_index & mask].buffer_length;
+ if ((b0->buffer_len %
+ ring->desc[b0->desc_index & mask].buffer_length) != 0)
chain_buf0++;
for (i = 0; i < chain_buf0; i++)
#endif /* MEMIF_DBG_SHM */
}
- head = (b0->desc_index + chain_buf0) & mask;
+ head = b0->desc_index + chain_buf0;
b0->data = NULL;
#ifdef MEMIF_DBG
if (c->fd < 0)
return MEMIF_ERR_DISCONNECTED;
uint8_t num =
- (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args.
- num_m2s_rings;
+ (c->args.is_master) ? c->run_args.num_s2m_rings : c->
+ run_args.num_m2s_rings;
if (qid >= num)
return MEMIF_ERR_QID;
memif_queue_t *mq = &c->rx_queues[qid];
memif_buffer_t *b0, *b1;
uint16_t curr_buf = 0;
*rx = 0;
+#ifdef MEMIF_DBG_SHM
int i;
+#endif /* MEMIF_DBG_SHM */
uint64_t b;
ssize_t r = read (mq->int_fd, &b, sizeof (b));
if (head == mq->last_head)
return 0;
- if (head > mq->last_head)
- ns = head - mq->last_head;
- else
- ns = (1 << mq->log2_ring_size) - mq->last_head + head;
+ ns = head - mq->last_head;
while (ns && count)
{
- DBG ("ns: %u, count: %u", ns, count);
while ((ns > 2) && (count > 2))
{
b0 = (bufs + curr_buf);
b1 = (bufs + curr_buf + 1);
b0->desc_index = mq->last_head;
- i = 0;
- b0->data_len = 0;
- b0->buffer_len = 0;
-
- b0->data = memif_get_buffer (conn, ring, mq->last_head);
- b0->data_len += ring->desc[mq->last_head].length;
- b0->buffer_len += ring->desc[mq->last_head].buffer_length;
+ b0->data = memif_get_buffer (conn, ring, mq->last_head & mask);
+ b0->data_len = ring->desc[mq->last_head & mask].length;
+ b0->buffer_len = ring->desc[mq->last_head & mask].buffer_length;
#ifdef MEMIF_DBG_SHM
+ i = 0;
print_bytes (b0->data +
- ring->desc[b0->desc_index].buffer_length * i++,
- ring->desc[b0->desc_index].buffer_length, DBG_TX_BUF);
+ ring->desc[b0->desc_index & mask].buffer_length * i++,
+ ring->desc[b0->desc_index & mask].buffer_length,
+ DBG_TX_BUF);
#endif /* MEMIF_DBG_SHM */
ns--;
*rx += 1;
- while (ring->desc[mq->last_head].flags & MEMIF_DESC_FLAG_NEXT)
+ while (ring->desc[mq->last_head & mask].
+ flags & MEMIF_DESC_FLAG_NEXT)
{
- ring->desc[mq->last_head].flags &= ~MEMIF_DESC_FLAG_NEXT;
- mq->last_head = (mq->last_head + 1) & mask;
- b0->data_len += ring->desc[mq->last_head].length;
- b0->buffer_len += ring->desc[mq->last_head].buffer_length;
+ ring->desc[mq->last_head & mask].flags &= ~MEMIF_DESC_FLAG_NEXT;
+ mq->last_head++;
+ b0->data_len += ring->desc[mq->last_head & mask].length;
+ b0->buffer_len +=
+ ring->desc[mq->last_head & mask].buffer_length;
#ifdef MEMIF_DBG_SHM
print_bytes (b0->data +
- ring->desc[b0->desc_index].buffer_length * i++,
- ring->desc[b0->desc_index].buffer_length,
+ ring->desc[b0->desc_index & mask].buffer_length *
+ i++,
+ ring->desc[b0->desc_index & mask].buffer_length,
DBG_TX_BUF);
#endif /* MEMIF_DBG_SHM */
ns--;
*rx += 1;
}
- mq->last_head = (mq->last_head + 1) & mask;
+ mq->last_head++;
b1->desc_index = mq->last_head;
- i = 0;
- b1->data_len = 0;
- b1->buffer_len = 0;
-
- b1->data = memif_get_buffer (conn, ring, mq->last_head);
- b1->data_len += ring->desc[mq->last_head].length;
- b1->buffer_len += ring->desc[mq->last_head].buffer_length;
+ b1->data = memif_get_buffer (conn, ring, mq->last_head & mask);
+ b1->data_len = ring->desc[mq->last_head & mask].length;
+ b1->buffer_len = ring->desc[mq->last_head & mask].buffer_length;
#ifdef MEMIF_DBG_SHM
+ i = 0;
print_bytes (b1->data +
- ring->desc[b1->desc_index].buffer_length * i++,
- ring->desc[b1->desc_index].buffer_length, DBG_TX_BUF);
+ ring->desc[b1->desc_index & mask].buffer_length * i++,
+ ring->desc[b1->desc_index & mask].buffer_length,
+ DBG_TX_BUF);
#endif /* MEMIF_DBG_SHM */
ns--;
*rx += 1;
- while (ring->desc[mq->last_head].flags & MEMIF_DESC_FLAG_NEXT)
+ while (ring->desc[mq->last_head & mask].
+ flags & MEMIF_DESC_FLAG_NEXT)
{
- ring->desc[mq->last_head].flags &= ~MEMIF_DESC_FLAG_NEXT;
- mq->last_head = (mq->last_head + 1) & mask;
- b1->data_len += ring->desc[mq->last_head].length;
- b1->buffer_len += ring->desc[mq->last_head].buffer_length;
+ ring->desc[mq->last_head & mask].flags &= ~MEMIF_DESC_FLAG_NEXT;
+ mq->last_head++;
+ b1->data_len += ring->desc[mq->last_head & mask].length;
+ b1->buffer_len +=
+ ring->desc[mq->last_head & mask].buffer_length;
#ifdef MEMIF_DBG_SHM
print_bytes (b1->data +
- ring->desc[b1->desc_index].buffer_length * i++,
- ring->desc[b1->desc_index].buffer_length,
+ ring->desc[b1->desc_index & mask].buffer_length *
+ i++,
+ ring->desc[b1->desc_index & mask].buffer_length,
DBG_TX_BUF);
#endif /* MEMIF_DBG_SHM */
ns--;
*rx += 1;
}
- mq->last_head = (mq->last_head + 1) & mask;
+ mq->last_head++;
count -= 2;
curr_buf += 2;
b0 = (bufs + curr_buf);
b0->desc_index = mq->last_head;
- i = 0;
- b0->data_len = 0;
- b0->buffer_len = 0;
-
- b0->data = memif_get_buffer (conn, ring, mq->last_head);
- b0->data_len += ring->desc[mq->last_head].length;
- b0->buffer_len += ring->desc[mq->last_head].buffer_length;
+ b0->data = memif_get_buffer (conn, ring, mq->last_head & mask);
+ b0->data_len = ring->desc[mq->last_head & mask].length;
+ b0->buffer_len = ring->desc[mq->last_head & mask].buffer_length;
#ifdef MEMIF_DBG_SHM
+ i = 0;
print_bytes (b0->data +
- ring->desc[b0->desc_index].buffer_length * i++,
- ring->desc[b0->desc_index].buffer_length, DBG_TX_BUF);
+ ring->desc[b0->desc_index & mask].buffer_length * i++,
+ ring->desc[b0->desc_index & mask].buffer_length,
+ DBG_TX_BUF);
#endif /* MEMIF_DBG_SHM */
ns--;
*rx += 1;
- while (ring->desc[mq->last_head].flags & MEMIF_DESC_FLAG_NEXT)
+ while (ring->desc[mq->last_head & mask].flags & MEMIF_DESC_FLAG_NEXT)
{
- ring->desc[mq->last_head].flags &= ~MEMIF_DESC_FLAG_NEXT;
- mq->last_head = (mq->last_head + 1) & mask;
- b0->data_len += ring->desc[mq->last_head].length;
- b0->buffer_len += ring->desc[mq->last_head].buffer_length;
+ ring->desc[mq->last_head & mask].flags &= ~MEMIF_DESC_FLAG_NEXT;
+ mq->last_head++;
+ b0->data_len += ring->desc[mq->last_head & mask].length;
+ b0->buffer_len += ring->desc[mq->last_head & mask].buffer_length;
#ifdef MEMIF_DBG_SHM
print_bytes (b0->data +
- ring->desc[b0->desc_index].buffer_length * i++,
- ring->desc[b0->desc_index].buffer_length, DBG_TX_BUF);
+ ring->desc[b0->desc_index & mask].buffer_length * i++,
+ ring->desc[b0->desc_index & mask].buffer_length,
+ DBG_TX_BUF);
#endif /* MEMIF_DBG_SHM */
ns--;
*rx += 1;
}
- mq->last_head = (mq->last_head + 1) & mask;
+ mq->last_head++;
count--;
curr_buf++;
err = MEMIF_ERR_NOBUF_DET;
md->rx_queues_num =
- (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args.
- num_m2s_rings;
+ (c->args.is_master) ? c->run_args.num_s2m_rings : c->
+ run_args.num_m2s_rings;
l1 = sizeof (memif_queue_details_t) * md->rx_queues_num;
if (l0 + l1 <= buflen)
{
md->rx_queues[i].qid = i;
md->rx_queues[i].ring_size = (1 << c->rx_queues[i].log2_ring_size);
+ md->rx_queues[i].flags = c->rx_queues[i].ring->flags;
+ md->rx_queues[i].head = c->rx_queues[i].ring->head;
+ md->rx_queues[i].tail = c->rx_queues[i].ring->tail;
md->rx_queues[i].buffer_size = c->run_args.buffer_size;
}
md->tx_queues_num =
- (c->args.is_master) ? c->run_args.num_m2s_rings : c->run_args.
- num_s2m_rings;
+ (c->args.is_master) ? c->run_args.num_m2s_rings : c->
+ run_args.num_s2m_rings;
l1 = sizeof (memif_queue_details_t) * md->tx_queues_num;
if (l0 + l1 <= buflen)
{
md->tx_queues[i].qid = i;
md->tx_queues[i].ring_size = (1 << c->tx_queues[i].log2_ring_size);
+ md->tx_queues[i].flags = c->tx_queues[i].ring->flags;
+ md->tx_queues[i].head = c->tx_queues[i].ring->head;
+ md->tx_queues[i].tail = c->tx_queues[i].ring->tail;
md->tx_queues[i].buffer_size = c->run_args.buffer_size;
}
if (c->fd < 0)
return MEMIF_ERR_DISCONNECTED;
uint8_t num =
- (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args.
- num_m2s_rings;
+ (c->args.is_master) ? c->run_args.num_s2m_rings : c->
+ run_args.num_m2s_rings;
if (qid >= num)
return MEMIF_ERR_QID;
memif_cleanup ()
{
libmemif_main_t *lm = &libmemif_main;
- if (lm->app_name)
- free (lm->app_name);
- lm->app_name = NULL;
if (lm->control_list)
free (lm->control_list);
lm->control_list = NULL;