ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmemif: cleanup queue info while memif connecting

Browse Source 
Change-Id: I4265fd0606f87f80f43f7f59ced1c3a73de82776
Signed-off-by: Chun Li <chunl2@cisco.com>
This commit is contained in:
Chun Li
2018-02-07 09:51:35 +08:00
parent bb17f3c2fc
commit 5dca5465f5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extras/libmemif/src/main.c
View File

@ -1398,11 +1398,13 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid,
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 */
ns = (1 << mq->log2_ring_size) - head + tail;
ring_size = (1 << mq->log2_ring_size);
ns = ring_size - head + tail;
/* calculate number of chain buffers */
if (size > ring->desc[0].buffer_length)

2
extras/libmemif/src/socket.c
View File

@ -519,6 +519,7 @@ memif_msg_receive_add_ring (memif_connection_t * c, memif_msg_t * msg, int fd)
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;
@ -538,6 +539,7 @@ memif_msg_receive_add_ring (memif_connection_t * c, memif_msg_t * msg, int fd)
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;