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

Merge pull request #13666 from jue89/feature/evtimer_now_msec

Browse Source 
net/gnrc/ipv6/nib: remove direct dependency to xtimer
This commit is contained in:
Martine Lenders 2020-03-26 13:50:13 +01:00 committed by GitHub
commit cba1a2da0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/include/evtimer.h
View File

@ -46,6 +46,7 @@
#include <stdint.h>
#include "xtimer.h"
#include "timex.h"
#ifdef __cplusplus
extern "C" {
@ -105,6 +106,22 @@ void evtimer_del(evtimer_t *evtimer, evtimer_event_t *event);
*/
void evtimer_print(const evtimer_t *evtimer);
/**
* @brief Return the current system time in msec
*/
static inline uint32_t evtimer_now_msec(void)
{
return xtimer_now_usec64() / US_PER_MS;
}
/**
* @brief Return the current system time in minutes
*/
static inline uint32_t evtimer_now_min(void)
{
return xtimer_now_usec64() / (US_PER_SEC * SEC_PER_MIN);
}
#ifdef __cplusplus
}
#endif

2
sys/net/gnrc/network_layer/ipv6/nib/_nib-6ln.c
View File

@ -234,7 +234,7 @@ _nib_abr_entry_t *_handle_abro(const sixlowpan_nd_opt_abr_t *abro)
if (abr->version >= abro_version) {
abr->version = abro_version;
abr->valid_until = _now_min() + ltime;
abr->valid_until = evtimer_now_min() + ltime;
}
/* correct for default value */
ltime = (ltime == 0) ? SIXLOWPAN_ND_OPT_ABR_LTIME_DEFAULT : ltime;

8
sys/net/gnrc/network_layer/ipv6/nib/_nib-6ln.h
View File

@ -24,7 +24,7 @@
#include "net/gnrc/ipv6/nib/conf.h"
#include "net/sixlowpan/nd.h"
#include "timex.h"
#include "xtimer.h"
#include "evtimer.h"
#include "_nib-arsm.h"
#include "_nib-internal.h"
@ -33,12 +33,6 @@
extern "C" {
#endif
static inline uint32_t _now_min(void)
{
return (uint32_t)((xtimer_now_usec64() / (US_PER_SEC * SEC_PER_MIN)) &
UINT32_MAX);
}
#if GNRC_IPV6_NIB_CONF_6LN || defined(DOXYGEN)
/**
* @brief Additional (local) status to ARO status values for tentative

2
sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c
View File

@ -13,7 +13,7 @@
* @author Martine Lenders <m.lenders@fu-berlin.de>
*/
#include "xtimer.h"
#include "evtimer.h"
#include "net/gnrc/ndp.h"
#include "net/gnrc/ipv6/nib.h"
#include "net/gnrc/netif/internal.h"

2
sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.c
View File

@ -789,7 +789,7 @@ _nib_offl_entry_t *_nib_pl_add(unsigned iface,
}
assert(valid_ltime >= pref_ltime);
if ((valid_ltime != UINT32_MAX) || (pref_ltime != UINT32_MAX)) {
uint32_t now = (xtimer_now_usec64() / US_PER_MS) & UINT32_MAX;
uint32_t now = evtimer_now_msec();
if (pref_ltime != UINT32_MAX) {
_evtimer_add(dst, GNRC_IPV6_NIB_PFX_TIMEOUT, &dst->pfx_timeout,
pref_ltime);

6
sys/net/gnrc/network_layer/ipv6/nib/_nib-router.c
View File

@ -63,7 +63,7 @@ void _handle_snd_mc_ra(gnrc_netif_t *netif)
if ((final_ra && (next_scheduled > NDP_MAX_RA_INTERVAL_MS)) ||
gnrc_netif_is_rtr_adv(netif)) {
_snd_rtr_advs(netif, NULL, final_ra);
netif->ipv6.last_ra = (xtimer_now_usec64() / US_PER_MS) & UINT32_MAX;
netif->ipv6.last_ra = evtimer_now_msec();
if ((netif->ipv6.ra_sent < NDP_MAX_INIT_RA_NUMOF) || final_ra) {
if ((netif->ipv6.ra_sent < NDP_MAX_INIT_RA_NUMOF) &&
(next_ra_time > NDP_MAX_INIT_RA_INTERVAL)) {
@ -100,7 +100,7 @@ void _snd_rtr_advs(gnrc_netif_t *netif, const ipv6_addr_t *dst, bool final)
static gnrc_pktsnip_t *_offl_to_pio(_nib_offl_entry_t *offl,
gnrc_pktsnip_t *ext_opts)
{
uint32_t now = (xtimer_now_usec64() / US_PER_MS) & UINT32_MAX;
uint32_t now = evtimer_now_msec();
gnrc_pktsnip_t *pio;
gnrc_netif_t *netif = gnrc_netif_get_by_pid(
_nib_onl_get_if(offl->next_hop)
@ -190,7 +190,7 @@ static gnrc_pktsnip_t *_build_ext_opts(gnrc_netif_t *netif,
}
ltime = (gnrc_netif_is_6lbr(netif)) ?
(SIXLOWPAN_ND_OPT_ABR_LTIME_DEFAULT) :
(abr->valid_until - _now_min());
(abr->valid_until - evtimer_now_min());
(void)ltime; /* gnrc_sixlowpan_nd_opt_abr_build might evaluate to NOP */
abro = gnrc_sixlowpan_nd_opt_abr_build(abr->version, ltime, &abr->addr,
ext_opts);

10
sys/net/gnrc/network_layer/ipv6/nib/nib.c
View File

@ -41,7 +41,7 @@
#define ENABLE_DEBUG (0)
#include "debug.h"
#if ENABLE_DEBUG
#include "xtimer.h"
#include "evtimer.h"
#endif
static char addr_str[IPV6_ADDR_MAX_STR_LEN];
@ -100,7 +100,7 @@ void gnrc_ipv6_nib_init(void)
static void _add_static_lladdr(gnrc_netif_t *netif)
{
#ifdef GNRC_IPV6_STATIC_LLADDR
/* parse addr from string and explicitely set a link lokal prefix
/* parse addr from string and explicitly set a link local prefix
* if ifnum > 1 each interface will get its own link local address
* with GNRC_IPV6_STATIC_LLADDR + i
*/
@ -327,7 +327,7 @@ void gnrc_ipv6_nib_handle_pkt(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
void gnrc_ipv6_nib_handle_timer_event(void *ctx, uint16_t type)
{
DEBUG("nib: Handle timer event (ctx = %p, type = 0x%04x, now = %ums)\n",
ctx, type, (unsigned)xtimer_now_usec() / 1000);
ctx, type, (unsigned)evtimer_now_msec());
_nib_acquire();
switch (type) {
#if GNRC_IPV6_NIB_CONF_ARSM
@ -525,7 +525,7 @@ static void _handle_rtr_sol(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
next_ra_delay);
}
else {
uint32_t now = (xtimer_now_usec64() / MS_PER_SEC) & UINT32_MAX;
uint32_t now = evtimer_now_msec();
/* check for integer overflows and initial value of last_ra */
if (((netif->ipv6.last_ra > (UINT32_MAX - NDP_MIN_MS_DELAY_BETWEEN_RAS) &&
@ -1261,7 +1261,7 @@ static void _handle_snd_na(gnrc_pktsnip_t *pkt)
static void _handle_pfx_timeout(_nib_offl_entry_t *pfx)
{
gnrc_netif_t *netif = gnrc_netif_get_by_pid(_nib_onl_get_if(pfx->next_hop));
uint32_t now = (xtimer_now_usec64() / US_PER_MS) & UINT32_MAX;
uint32_t now = evtimer_now_msec();
gnrc_netif_acquire(netif);
if (now >= pfx->valid_until) {

2
sys/net/gnrc/network_layer/ipv6/nib/nib_abr.c
View File

@ -78,7 +78,7 @@ bool gnrc_ipv6_nib_abr_iter(void **state, gnrc_ipv6_nib_abr_t *entry)
void gnrc_ipv6_nib_abr_print(gnrc_ipv6_nib_abr_t *abr)
{
char addr_str[IPV6_ADDR_MAX_STR_LEN];
uint32_t now = _now_min();
uint32_t now = evtimer_now_min();
printf("%s v%" PRIu32 " expires %" PRIu32 "min\n",
ipv6_addr_to_str(addr_str, &abr->addr, sizeof(addr_str)),

4
sys/net/gnrc/network_layer/ipv6/nib/nib_pl.c
View File

@ -20,7 +20,7 @@
#include "net/gnrc/ipv6/nib/pl.h"
#include "net/gnrc/netif/internal.h"
#include "timex.h"
#include "xtimer.h"
#include "evtimer.h"
#include "_nib-internal.h"
#include "_nib-router.h"
@ -147,7 +147,7 @@ void gnrc_ipv6_nib_pl_print(gnrc_ipv6_nib_pl_t *entry)
{
char addr_str[IPV6_ADDR_MAX_STR_LEN];
ipv6_addr_t pfx = IPV6_ADDR_UNSPECIFIED;
uint32_t now = ((xtimer_now_usec64() / US_PER_MS)) & UINT32_MAX;
uint32_t now = evtimer_now_msec();
ipv6_addr_init_prefix(&pfx, &entry->pfx, entry->pfx_len);
printf("%s/%u ", ipv6_addr_to_str(addr_str, &pfx, sizeof(addr_str)),