kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

Merge pull request #16193 from miri64/gnrc_netif_pktq/feat/usage

Browse Source 
gnrc_netif_pktq: add function to check usage
This commit is contained in:
Martine Lenders 2021-03-18 23:05:27 +01:00 committed by GitHub
commit 214fdf007d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/include/net/gnrc/netif/pktq.h
View File

@ -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
*

12
sys/net/gnrc/netif/pktq/gnrc_netif_pktq.c
View File

@ -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);

18
tests/unittests/tests-gnrc_netif_pktq/tests-gnrc_netif_pktq.c
View File

@ -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;
@ -40,6 +45,8 @@ 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)
@ -47,8 +54,10 @@ 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)
@ -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)
@ -74,6 +85,8 @@ 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)
@ -81,8 +94,10 @@ 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)
@ -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)
@ -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),