Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnrc_netif_pktq: add function to check usage #16193

Merged
merged 2 commits into from
Mar 18, 2021
Merged

gnrc_netif_pktq: add function to check usage #16193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db8415b
gnrc_netif_pktq: add function to check usage
miri64 Mar 15, 2021
6507d04
tests/unittests: extend tests for gnrc_netif_pktq_usage()
miri64 Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions sys/include/net/gnrc/netif/pktq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ extern "C" {
*/
int gnrc_netif_pktq_put(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt);

/**
* @brief Returns the overall usage of the packet queue resources
*
* @return Number of gnrc_pktqueue_t entries currently in use.
*/
unsigned gnrc_netif_pktq_usage(void);

/**
* @brief Gets a packet from the packet send queue of a network interface
*
Expand Down
12 changes: 12 additions & 0 deletions sys/net/gnrc/netif/pktq/gnrc_netif_pktq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ static gnrc_pktqueue_t *_get_free_entry(void)
return NULL;
}

unsigned gnrc_netif_pktq_usage(void)
{
unsigned res = 0;

for (unsigned i = 0; i < CONFIG_GNRC_NETIF_PKTQ_POOL_SIZE; i++) {
if (_pool[i].pkt != NULL) {
res++;
}
}
return res;
}

int gnrc_netif_pktq_put(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
{
assert(netif != NULL);
Expand Down
18 changes: 18 additions & 0 deletions tests/unittests/tests-gnrc_netif_pktq/tests-gnrc_netif_pktq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ static void test_pktq_get__empty(void)
TEST_ASSERT_NULL(gnrc_netif_pktq_get(&_netif));
}

static void test_pktq_usage__empty(void)
{
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_usage());
}

static void test_pktq_put__full(void)
{
gnrc_pktsnip_t pkt;
Expand All @@ -40,15 +45,19 @@ static void test_pktq_put__full(void)
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_put(&_netif, &pkt));
}
TEST_ASSERT_EQUAL_INT(-1, gnrc_netif_pktq_put(&_netif, &pkt));
TEST_ASSERT_EQUAL_INT(CONFIG_GNRC_NETIF_PKTQ_POOL_SIZE,
gnrc_netif_pktq_usage());
}

static void test_pktq_put_get1(void)
{
gnrc_pktsnip_t pkt_in, *pkt_out;

TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_put(&_netif, &pkt_in));
TEST_ASSERT_EQUAL_INT(1, gnrc_netif_pktq_usage());
TEST_ASSERT_NOT_NULL((pkt_out = gnrc_netif_pktq_get(&_netif)));
TEST_ASSERT(&pkt_in == pkt_out);
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_usage());
}

static void test_pktq_put_get3(void)
Expand All @@ -58,12 +67,14 @@ static void test_pktq_put_get3(void)
for (unsigned i = 0; i < 3; i++) {
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_put(&_netif, &pkt_in[i]));
}
TEST_ASSERT_EQUAL_INT(3, gnrc_netif_pktq_usage());
for (unsigned i = 0; i < 3; i++) {
gnrc_pktsnip_t *pkt_out;

TEST_ASSERT_NOT_NULL((pkt_out = gnrc_netif_pktq_get(&_netif)));
TEST_ASSERT(&pkt_in[i] == pkt_out);
}
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_usage());
}

static void test_pktq_push_back__full(void)
Expand All @@ -74,15 +85,19 @@ static void test_pktq_push_back__full(void)
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_put(&_netif, &pkt));
}
TEST_ASSERT_EQUAL_INT(-1, gnrc_netif_pktq_push_back(&_netif, &pkt));
TEST_ASSERT_EQUAL_INT(CONFIG_GNRC_NETIF_PKTQ_POOL_SIZE,
gnrc_netif_pktq_usage());
}

static void test_pktq_push_back_get1(void)
{
gnrc_pktsnip_t pkt_in, *pkt_out;

TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_push_back(&_netif, &pkt_in));
TEST_ASSERT_EQUAL_INT(1, gnrc_netif_pktq_usage());
TEST_ASSERT_NOT_NULL((pkt_out = gnrc_netif_pktq_get(&_netif)));
TEST_ASSERT(&pkt_in == pkt_out);
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_usage());
}

static void test_pktq_push_back_get3(void)
Expand All @@ -92,12 +107,14 @@ static void test_pktq_push_back_get3(void)
for (unsigned i = 0; i < 3; i++) {
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_push_back(&_netif, &pkt_in[i]));
}
TEST_ASSERT_EQUAL_INT(3, gnrc_netif_pktq_usage());
for (unsigned i = 0; i < 3; i++) {
gnrc_pktsnip_t *pkt_out;

TEST_ASSERT_NOT_NULL((pkt_out = gnrc_netif_pktq_get(&_netif)));
TEST_ASSERT(&pkt_in[3 - i - 1] == pkt_out);
}
TEST_ASSERT_EQUAL_INT(0, gnrc_netif_pktq_usage());
}

static void test_pktq_empty(void)
Expand All @@ -119,6 +136,7 @@ static Test *test_gnrc_netif_pktq(void)
{
EMB_UNIT_TESTFIXTURES(fixtures) {
new_TestFixture(test_pktq_get__empty),
new_TestFixture(test_pktq_usage__empty),
new_TestFixture(test_pktq_put__full),
new_TestFixture(test_pktq_put_get1),
new_TestFixture(test_pktq_put_get3),
Expand Down