Skip to content

gnrc/netif: convert to ztimer#17354

Merged
fjmolinas merged 3 commits intoRIOT-OS:masterfrom
bergzand:pr/gnrc_netif/ztimer
Jan 31, 2022
Merged

gnrc/netif: convert to ztimer#17354
fjmolinas merged 3 commits intoRIOT-OS:masterfrom
bergzand:pr/gnrc_netif/ztimer

Conversation

@bergzand
Copy link
Copy Markdown
Member

@bergzand bergzand commented Dec 8, 2021

Contribution description

This converts gnrc_netif.c to use ztimer instead of xtimer.

Testing procedure

I think the test in tests tests/gnrc_netif_ipv6_wait_for_global_address should be sufficient:

koen@zometeen ~/dev/RIOT-dev $ make -C tests/gnrc_netif_ipv6_wait_for_global_address/ term
make: Entering directory '/home/koen/dev/RIOT-dev/tests/gnrc_netif_ipv6_wait_for_global_address'
/home/koen/dev/RIOT-dev/tests/gnrc_netif_ipv6_wait_for_global_address/bin/native/tests_gnrc_netif_ipv6_wait_for_global_address.elf /dev/ttyACM0 
RIOT native interrupts/signals initialized.
LED_RED_OFF
LED_GREEN_ON
RIOT native board initialized.
RIOT native hardware initialization complete.

Help: Press s to start test, r to print it is ready
s
START
....
OK (4 tests)

Issues/PRs references

On the list of #17111

Copy link
Copy Markdown
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments...

@fjmolinas
Copy link
Copy Markdown
Contributor

Please squash!

@bergzand bergzand force-pushed the pr/gnrc_netif/ztimer branch from d02aea1 to 2304ac3 Compare December 8, 2021 12:26
@bergzand
Copy link
Copy Markdown
Member Author

bergzand commented Dec 8, 2021

Please squash!

squashed!

fjmolinas
fjmolinas previously approved these changes Dec 8, 2021
Copy link
Copy Markdown
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK, straightforward enough, ran the test on multiple BOARDs all passing.

@fjmolinas fjmolinas added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Dec 8, 2021
@fjmolinas fjmolinas enabled auto-merge December 8, 2021 19:19
@fjmolinas fjmolinas disabled auto-merge December 8, 2021 19:21
@fjmolinas fjmolinas dismissed their stale review December 8, 2021 19:22

I had testted on the wrong branch

@fjmolinas
Copy link
Copy Markdown
Contributor

There seems to be an issue, the test does not pass on frdm-kw41z, did on master, it simply stalls

@fjmolinas
Copy link
Copy Markdown
Contributor

There seems to be an issue, the test does not pass on frdm-kw41z, did on master, it simply stalls

This issue was fixed with #17393

Copy link
Copy Markdown
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-ACK @bergzand can you push a commit adding the required BOARDs to Makefile.ci, since this one is a bit old, could you rebase as well?

@bergzand bergzand force-pushed the pr/gnrc_netif/ztimer branch from 2304ac3 to fe0b297 Compare January 28, 2022 12:39
@github-actions github-actions bot added the Area: examples Area: Example Applications label Jan 28, 2022
@@ -1,3 +1,4 @@
BOARD_INSUFFICIENT_MEMORY := \
stm32f030f4-demo \
pba-d-01-kw2x \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is needed?

BOARD=pba-d-01-kw2x make -C examples/ccn-lite-relay/ -j
Building application "ccn-lite-relay" for "pba-d-01-kw2x" with MCU "kinetis".

"make" -C /home/francisco/workspace/RIOT/pkg/ccn-lite
/home/francisco/workspace/RIOT/dist/tools/cmake/generate-xcompile-toolchain.sh > /home/francisco/workspace/RIOT/build/pkg/ccn-lite/xcompile-toolchain.cmake
cmake -B/home/francisco/workspace/RIOT/examples/ccn-lite-relay/bin/pba-d-01-kw2x/pkg-build/ccn-lite -H/home/francisco/workspace/RIOT/build/pkg/ccn-lite/src \
      -DCMAKE_TOOLCHAIN_FILE=/home/francisco/workspace/RIOT/build/pkg/ccn-lite/xcompile-toolchain.cmake \
      -DCCNL_RIOT=1 -DRIOT_CFLAGS="-isystem /home/francisco/opt/gcc-arm-none-eabi-10-2020-q4-major/arm-none-eabi/include/newlib-nano -I/home/francisco/workspace/RIOT/core/include -I/home/francisco/workspace/RIOT/drivers/include -I/home/francisco/workspace/RIOT/sys/include -I/home/francisco/workspace/RIOT/boards/pba-d-01-kw2x/include -I/home/francisco/workspace/RIOT/cpu/kinetis/include -I/home/francisco/workspace/RIOT/cpu/cortexm_common/include -I/home/francisco/workspace/RIOT/cpu/cortexm_common/include/vendor -I/home/francisco/workspace/RIOT/sys/libc/include -I/home/francisco/workspace/RIOT/build/pkg/ccn-lite/src/ccnl-riot/include -I/home/francisco/workspace/RIOT/build/pkg/ccn-lite/src/ccnl-core/include -I/home/francisco/workspace/RIOT/build/pkg/ccn-lite/src/ccnl-pkt/include -I/home/francisco/workspace/RIOT/build/pkg/ccn-lite/src/ccnl-fwd/include -I/home/francisco/workspace/RIOT/sys/net/gnrc/pktbuf/include -I/home/francisco/workspace/RIOT/sys/net/gnrc/pktbuf_static/include -I/home/francisco/workspace/RIOT/sys/posix/include -I/home/francisco/workspace/RIOT/sys/net/link_layer/eui_provider/include -I/home/francisco/workspace/RIOT/drivers/kw2xrf/include" -DBUILD_TESTING=OFF
Doxygen build started
-- Configuring done
-- Generating done
-- Build files have been written to: /home/francisco/workspace/RIOT/examples/ccn-lite-relay/bin/pba-d-01-kw2x/pkg-build/ccn-lite
make -C /home/francisco/workspace/RIOT/examples/ccn-lite-relay/bin/pba-d-01-kw2x/pkg-build/ccn-lite
[ 11%] Built target ccnl-pkt
[ 13%] Built target ccnl-fwd
[ 48%] Built target ccnl-core
[100%] Built target ccnl-riot
"make" -C /home/francisco/workspace/RIOT/boards/pba-d-01-kw2x
"make" -C /home/francisco/workspace/RIOT/core
"make" -C /home/francisco/workspace/RIOT/cpu/kinetis
"make" -C /home/francisco/workspace/RIOT/drivers
"make" -C /home/francisco/workspace/RIOT/sys
"make" -C /home/francisco/workspace/RIOT/drivers/kw2xrf
"make" -C /home/francisco/workspace/RIOT/drivers/netdev
"make" -C /home/francisco/workspace/RIOT/sys/auto_init
"make" -C /home/francisco/workspace/RIOT/drivers/periph_common
"make" -C /home/francisco/workspace/RIOT/sys/div
"make" -C /home/francisco/workspace/RIOT/cpu/cortexm_common
"make" -C /home/francisco/workspace/RIOT/sys/evtimer
"make" -C /home/francisco/workspace/RIOT/cpu/kinetis/periph
"make" -C /home/francisco/workspace/RIOT/sys/fmt
"make" -C /home/francisco/workspace/RIOT/sys/frac
"make" -C /home/francisco/workspace/RIOT/sys/isrpipe
"make" -C /home/francisco/workspace/RIOT/sys/luid
"make" -C /home/francisco/workspace/RIOT/sys/malloc_thread_safe
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc
"make" -C /home/francisco/workspace/RIOT/sys/net/link_layer/eui_provider
"make" -C /home/francisco/workspace/RIOT/sys/net/link_layer/ieee802154
"make" -C /home/francisco/workspace/RIOT/sys/net/link_layer/l2util
"make" -C /home/francisco/workspace/RIOT/cpu/cortexm_common/periph
"make" -C /home/francisco/workspace/RIOT/sys/net/netif
"make" -C /home/francisco/workspace/RIOT/sys/newlib_syscalls_default
"make" -C /home/francisco/workspace/RIOT/sys/od
"make" -C /home/francisco/workspace/RIOT/sys/pm_layered
"make" -C /home/francisco/workspace/RIOT/sys/ps
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/netapi
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/netif
"make" -C /home/francisco/workspace/RIOT/sys/random
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/netreg
"make" -C /home/francisco/workspace/RIOT/sys/shell
"make" -C /home/francisco/workspace/RIOT/sys/shell/commands
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/pkt
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/pktbuf
"make" -C /home/francisco/workspace/RIOT/sys/stdio_uart
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/pktbuf_static
"make" -C /home/francisco/workspace/RIOT/sys/timex
"make" -C /home/francisco/workspace/RIOT/sys/tsrb
"make" -C /home/francisco/workspace/RIOT/sys/ztimer
"make" -C /home/francisco/workspace/RIOT/sys/ztimer64
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/pktdump
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/netif/hdr
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/netif/ieee802154
"make" -C /home/francisco/workspace/RIOT/sys/net/gnrc/netif/init_devs
   text	   data	    bss	    dec	    hex	filename
  62660	    180	  14848	  77688	  12f78	/home/francisco/workspace/RIOT/examples/ccn-lite-relay/bin/pba-d-01-kw2x/ccn-lite-relay.elf

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, fixed with the latests push

@bergzand bergzand force-pushed the pr/gnrc_netif/ztimer branch from 78594a4 to 93ac9d9 Compare January 28, 2022 13:04
@github-actions github-actions bot removed the Area: examples Area: Example Applications label Jan 28, 2022
@fjmolinas fjmolinas merged commit ba325e8 into RIOT-OS:master Jan 31, 2022
@fjmolinas
Copy link
Copy Markdown
Contributor

Thanks @bergzand!

@bergzand bergzand deleted the pr/gnrc_netif/ztimer branch January 31, 2022 09:38
@OlegHahm OlegHahm added this to the Release 2022.04 milestone Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: network Area: Networking Area: sys Area: System Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants