diff options
| author |   Chun Li <chunl2@cisco.com> | 2018-02-07 09:51:35 +0800 |
|---|---|---|
| committer | Chun Li <chunl2@cisco.com> | 2018-02-07 10:02:20 +0800 |
| commit | 5dca5465f5c31c3b887e9e2341878d4f97a4a6f8 (patch) | |
| tree | 3302a6c87308f6c85cb98a8e8c0cec6b88b4a954 /extras/libmemif | |
| parent | bb17f3c2fc0c8163bdb08ad1e66ff4ac5898508f (diff) | |
libmemif: cleanup queue info while memif connecting
Change-Id: I4265fd0606f87f80f43f7f59ced1c3a73de82776
Signed-off-by: Chun Li <chunl2@cisco.com>
Diffstat (limited to 'extras/libmemif')
| -rw-r--r-- | extras/libmemif/src/main.c | 4 | ||||
| -rw-r--r-- | extras/libmemif/src/socket.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/extras/libmemif/src/main.c b/extras/libmemif/src/main.c index 9b5bdd2f81d..372bf756a02 100644 --- a/extras/libmemif/src/main.c +++ b/extras/libmemif/src/main.c @@ -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) diff --git a/extras/libmemif/src/socket.c b/extras/libmemif/src/socket.c index ca24d929e35..2be40f8669d 100644 --- a/extras/libmemif/src/socket.c +++ b/extras/libmemif/src/socket.c @@ -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; |