summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChun Li <chunl2@cisco.com>2018-02-07 09:51:35 +0800
committerChun Li <chunl2@cisco.com>2018-02-07 10:02:20 +0800
commit5dca5465f5c31c3b887e9e2341878d4f97a4a6f8 (patch)
tree3302a6c87308f6c85cb98a8e8c0cec6b88b4a954
parentbb17f3c2fc0c8163bdb08ad1e66ff4ac5898508f (diff)
libmemif: cleanup queue info while memif connecting
Change-Id: I4265fd0606f87f80f43f7f59ced1c3a73de82776 Signed-off-by: Chun Li <chunl2@cisco.com>
Diffstat
-rw-r--r--extras/libmemif/src/main.c4
-rw-r--r--extras/libmemif/src/socket.c2
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;
7b (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79

# Copyright (c) 2016 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

*** Variables ***
# Interfaces to run tests on.
| ${interface}= | ${node['interfaces']['port1']['name']}
| ${tap_interface}= | tap_test
# Configuration which will be set and verified during tests.
| &{tap_settings}= | tap-name=tap_test | mac=08:00:27:c0:5d:37
| ... | device-instance=${1}
| &{tap_settings2}= | tap-name=tap_test | mac=08:00:27:60:26:ab
| ... | device-instance=${2}

*** Settings ***
| Resource | resources/libraries/robot/shared/default.robot
| Resource | resources/libraries/robot/honeycomb/honeycomb.robot
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Resource | resources/libraries/robot/honeycomb/tap.robot
| ...
| Force Tags | HC_FUNC
| ...
| Suite Setup | Set Up Honeycomb Functional Test Suite | ${node}
| ...
| Suite Teardown | Tear Down Honeycomb Functional Test Suite | ${node}
| ...
| Documentation | *Honeycomb TAP management test suite.*

*** Test Cases ***
| TC01: Honeycomb configures TAP interface
| | [Documentation] | Check if Honeycomb API can configure a TAP interface.
| | ...
| | Given TAP Operational Data From Honeycomb Should Be empty
| | ... | ${node} | ${tap_interface}
| | And TAP Operational Data From VAT Should Be empty
| | ... | ${node} | ${tap_interface}
| | When Honeycomb creates TAP interface
| | ... | ${node} | ${tap_interface} | ${tap_settings}
| | Then TAP Operational Data From Honeycomb Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings}
| | And TAP Operational Data From VAT Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings}

| TC02: Honeycomb modifies existing TAP interface configuration
| | [Documentation] | Check if Honeycomb API can re-configure and existing TAP\
| | ... | interface with new settings.
| | ...
| | Given TAP Operational Data From Honeycomb Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings}
| | And TAP Operational Data From VAT Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings}
| | When Honeycomb configures TAP interface
| | ... | ${node} | ${tap_interface} | ${tap_settings2}
| | Then TAP Operational Data From Honeycomb Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings2}
| | And TAP Operational Data From VAT Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings2}

| TC03: Honeycomb removes TAP interface
| | [Documentation] | Check if Honeycomb API can remove TAP interface.
| | ...
| | Given TAP Operational Data From Honeycomb Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings2}
| | And TAP Operational Data From VAT Should Be
| | ... | ${node} | ${tap_interface} | ${tap_settings2}
| | When Honeycomb removes TAP interface | ${node} | ${tap_interface}
| | Then TAP Operational Data From Honeycomb Should Be empty
| | ... | ${node} | ${tap_interface}
| | And TAP Operational Data From VAT Should Be empty
| | ... | ${node} | ${tap_interface}