riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17354 from bergzand/pr/gnrc_netif/ztimer

Browse Source 
gnrc/netif: convert to ztimer
This commit is contained in:
Francisco 2022-01-31 09:42:28 +01:00 committed by GitHub
commit ba325e8a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/net/gnrc/Makefile.dep
View File

@ -137,6 +137,7 @@ ifneq (,$(filter gnrc_netif,$(USEMODULE)))
USEMODULE += netif USEMODULE += netif
USEMODULE += l2util USEMODULE += l2util
USEMODULE += fmt USEMODULE += fmt
USEMODULE += ztimer_msec
ifneq (,$(filter netdev_ieee802154_submac,$(USEMODULE))) ifneq (,$(filter netdev_ieee802154_submac,$(USEMODULE)))
USEMODULE += gnrc_netif_pktq USEMODULE += gnrc_netif_pktq
endif endif

13
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -41,8 +41,8 @@
#include "fmt.h" #include "fmt.h"
#include "log.h" #include "log.h"
#include "sched.h" #include "sched.h"
#if IS_USED(MODULE_XTIMER) || IS_USED(MODULE_ZTIMER_XTIMER_COMPAT) #if IS_USED(MODULE_ZTIMER)
#include "xtimer.h" #include "ztimer.h"
#endif #endif
#include "net/gnrc/netif.h" #include "net/gnrc/netif.h"
@ -1370,7 +1370,7 @@ bool gnrc_netif_ipv6_wait_for_global_address(gnrc_netif_t *netif,
/* wait for global address */ /* wait for global address */
msg_t m; msg_t m;
while (!has_global) { while (!has_global) {
if (xtimer_msg_receive_timeout(&m, timeout_ms * US_PER_MS) < 0) { if (ztimer_msg_receive_timeout(ZTIMER_MSEC, &m, timeout_ms) < 0) {
DEBUG_PUTS("gnrc_netif: timeout waiting for prefix"); DEBUG_PUTS("gnrc_netif: timeout waiting for prefix");
break; break;
} }
@ -1867,7 +1867,7 @@ static void *_gnrc_netif_thread(void *args)
/* now let rest of GNRC use the interface */ /* now let rest of GNRC use the interface */
gnrc_netif_release(netif); gnrc_netif_release(netif);
#if (CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US > 0U) #if (CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US > 0U)
xtimer_ticks32_t last_wakeup = xtimer_now(); uint32_t last_wakeup = ztimer_now(ZTIMER_USEC);
#endif #endif
while (1) { while (1) {
@ -1893,13 +1893,14 @@ static void *_gnrc_netif_thread(void *args)
DEBUG("gnrc_netif: GNRC_NETDEV_MSG_TYPE_SND received\n"); DEBUG("gnrc_netif: GNRC_NETDEV_MSG_TYPE_SND received\n");
_send(netif, msg.content.ptr, false); _send(netif, msg.content.ptr, false);
#if (CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US > 0U) #if (CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US > 0U)
xtimer_periodic_wakeup( ztimer_periodic_wakeup(
ZTIMER_USEC,
&last_wakeup, &last_wakeup,
CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US
); );
/* override last_wakeup in case last_wakeup + /* override last_wakeup in case last_wakeup +
* CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US was in the past */ * CONFIG_GNRC_NETIF_MIN_WAIT_AFTER_SEND_US was in the past */
last_wakeup = xtimer_now(); last_wakeup = ztimer_now(ZTIMER_USEC);
#endif #endif
break; break;
case GNRC_NETAPI_MSG_TYPE_SET: case GNRC_NETAPI_MSG_TYPE_SET:

1
tests/driver_at86rf215/Makefile.ci
View File

@ -31,4 +31,5 @@ BOARD_INSUFFICIENT_MEMORY := \
telosb \ telosb \
waspmote-pro \ waspmote-pro \
zigduino \ zigduino \
z1
# #

10
tests/gnrc_netif_ipv6_wait_for_global_address/main.c
View File

@ -27,7 +27,7 @@
#include "net/gnrc/netif.h" #include "net/gnrc/netif.h"
#include "net/gnrc/netif/raw.h" #include "net/gnrc/netif/raw.h"
#include "net/netdev_test.h" #include "net/netdev_test.h"
#include "xtimer.h" #include "ztimer.h"
#define TEST_NETIF_NUMOF 2 #define TEST_NETIF_NUMOF 2
#define TEST_NETIF_PRIO 3 #define TEST_NETIF_PRIO 3
@ -54,7 +54,7 @@ static void tear_down(void)
static void *_adder_thread(void *netif) static void *_adder_thread(void *netif)
{ {
xtimer_msleep(10); ztimer_sleep(ZTIMER_MSEC, 10);
gnrc_netif_ipv6_addr_add(netif, &_test_addr, 64, gnrc_netif_ipv6_addr_add(netif, &_test_addr, 64,
GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_VALID); GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_VALID);
return NULL; return NULL;
@ -74,16 +74,16 @@ static void _assert_wait_blocks(gnrc_netif_t *add_netif,
gnrc_netif_t *wait_netif, gnrc_netif_t *wait_netif,
bool success) bool success)
{ {
uint32_t now = xtimer_now_usec(); uint32_t now = ztimer_now(ZTIMER_MSEC);
uint32_t timeout = 20; uint32_t timeout = 20;
_add_delayed_addr(add_netif); _add_delayed_addr(add_netif);
TEST_ASSERT(gnrc_netif_ipv6_wait_for_global_address(wait_netif, TEST_ASSERT(gnrc_netif_ipv6_wait_for_global_address(wait_netif,
timeout) == success); timeout) == success);
if (success) { if (success) {
TEST_ASSERT(((xtimer_now_usec() - now) / US_PER_MS) < timeout); TEST_ASSERT((ztimer_now(ZTIMER_MSEC) - now) < timeout);
} else { } else {
TEST_ASSERT(((xtimer_now_usec() - now) / US_PER_MS) >= timeout); TEST_ASSERT((ztimer_now(ZTIMER_MSEC) - now) >= timeout);
} }
} }