sys/cpp11-compat: Remove xtimer deps by MrKevinWeiss · Pull Request #19369 · RIOT-OS/RIOT

MrKevinWeiss · 2023-03-09T13:09:46Z

Contribution description

This replaces the xtimer calls with explicit ztimer64 calls, since xtimer is somewhat deprecated.

Testing procedure

Green murdock
I suppose the following tests/

c11_atomics_cpp_compat
cpp11_condition_variable
cpp11_mutex
cpp11_thread
cpp_ctors
cpp_exclude
cpp_ext
irq_cpp
rmutex_cp

run compile_and_test_for_board.py and compile_like_murdock.py for the subset of tests.

Issues/PRs references

riot-ci · 2023-03-09T13:41:07Z

Murdock results

✔️ PASSED

95c238a tests/cpp11_thread: Update BOARD_INSUFFICIENT_MEMORY

Success	Failures	Total	Runtime
6882	0	6882	09m:48s

Artifacts

Documentation preview

MrKevinWeiss · 2023-03-14T10:53:00Z

Any blockers? @josephnoir originally did this?

kfessel · 2023-03-15T17:54:57Z

sys/cpp11-compat/include/riot/condition_variable.hpp

-  xtimer_now_timex(&before);
-  xtimer_t timer;
-  xtimer_set_wakeup(&timer, timex_uint64(timeout), thread_getpid());
+  before = timex_from_uint64(ztimer64_now(ZTIMER64_USEC));


Why is duration cast to timex_t (l176 to 179) ? (not to 64bit microseconds directly)

kfessel · 2023-03-15T17:56:15Z

tests/cpp11_condition_variable/main.cpp

+    before = timex_from_uint64(ztimer64_now(ZTIMER64_USEC));
    cv.wait_for(lk, chrono::seconds(timeout));
-    xtimer_now_timex(&after);
+    after = timex_from_uint64(ztimer64_now(ZTIMER64_USEC));


seems also like unforced use of timex

MrKevinWeiss

Note that there is still a dependency on timex for the type...

MrKevinWeiss · 2023-03-16T13:28:30Z

sys/cpp11-compat/include/riot/condition_variable.hpp

-  xtimer_now_timex(&before);
-  xtimer_t timer;
-  xtimer_set_wakeup(&timer, timex_uint64(timeout), thread_getpid());
+  before = timex_from_uint64(ztimer64_now(ZTIMER64_USEC));


MrKevinWeiss · 2023-03-16T13:28:42Z

tests/cpp11_condition_variable/main.cpp

+    before = timex_from_uint64(ztimer64_now(ZTIMER64_USEC));
    cv.wait_for(lk, chrono::seconds(timeout));
-    xtimer_now_timex(&after);
+    after = timex_from_uint64(ztimer64_now(ZTIMER64_USEC));


kfessel · 2023-03-16T14:31:45Z

sys/cpp11-compat/include/riot/condition_variable.hpp

+  timeout = s.count() * US_PER_SEC;
+  timeout += (duration_cast<microseconds>(timeout_duration - s)).count();


Suggested change

timeout = s.count() * US_PER_SEC;

timeout += (duration_cast<microseconds>(timeout_duration - s)).count();

timeout = duration_cast<microseconds>(timeout_duration).count();

and remove line 176

Right, I thought that microseconds overflow at 1 second but I guess that was done as a result of timex. Done.

kfessel

reads good, tested good

please squash,
while doing that please correct the commit messages to "*: Use ztimer64_usec instead of xtimer" as these are ports to ztimer64 (which requires no aquire and release and has the timer (and therefor clock) always running)

MrKevinWeiss · 2023-03-24T12:18:53Z

Thanks!

MrKevinWeiss · 2023-03-24T12:19:05Z

bors merge

19369: sys/cpp11-compat: Remove xtimer deps r=MrKevinWeiss a=MrKevinWeiss ### Contribution description This replaces the `xtimer` calls with explicit `ztimer64` calls, since `xtimer` is somewhat deprecated. ### Testing procedure - Green murdock - I suppose the following `tests/` ``` c11_atomics_cpp_compat cpp11_condition_variable cpp11_mutex cpp11_thread cpp_ctors cpp_exclude cpp_ext irq_cpp rmutex_cp ``` - run `compile_and_test_for_board.py` and `compile_like_murdock.py` for the subset of tests. ### Issues/PRs references Co-authored-by: MrKevinWeiss <[email protected]>

bors · 2023-03-24T12:46:06Z

Build failed:

Murdock

MrKevinWeiss · 2023-03-24T14:14:10Z

Hmm I don't like how it is bigger...

kfessel · 2023-03-24T14:47:20Z

it shrunk for stm32f7 (m7) and stm32f3(m4) and increased for stm32l0 (m0+)

   text    data     bss     dec     hex filename
  36364     196    2476   39036    987c cpppr/tests/cpp11_thread/bin/nucleo-f767zi/tests_cpp11_thread.elf
  36584     196    2476   39256    9958 master/tests/cpp11_thread/bin/nucleo-f767zi/tests_cpp11_thread.elf
  36072     192    2468   38732    974c cpppr/tests/cpp11_thread/bin/nucleo-l053r8/tests_cpp11_thread.elf
  35908     192    2468   38568    96a8 master/tests/cpp11_thread/bin/nucleo-l053r8/tests_cpp11_thread.elf
  35784     192    2476   38452    9634 cpppr/tests/cpp11_thread/bin/nucleo-f303re/tests_cpp11_thread.elf
  36004     192    2476   38672    9710 master/tests/cpp11_thread/bin/nucleo-f303re/tests_cpp11_thread.elf

MrKevinWeiss · 2023-03-27T08:03:03Z

bors merge

19369: sys/cpp11-compat: Remove xtimer deps r=MrKevinWeiss a=MrKevinWeiss ### Contribution description This replaces the `xtimer` calls with explicit `ztimer64` calls, since `xtimer` is somewhat deprecated. ### Testing procedure - Green murdock - I suppose the following `tests/` ``` c11_atomics_cpp_compat cpp11_condition_variable cpp11_mutex cpp11_thread cpp_ctors cpp_exclude cpp_ext irq_cpp rmutex_cp ``` - run `compile_and_test_for_board.py` and `compile_like_murdock.py` for the subset of tests. ### Issues/PRs references Co-authored-by: MrKevinWeiss <[email protected]>

bors · 2023-03-27T08:31:07Z

Build failed:

Murdock

MrKevinWeiss · 2023-03-27T19:20:53Z

bors merge

bors · 2023-03-27T21:23:38Z

Build succeeded:

MrKevinWeiss · 2023-03-28T09:54:48Z

thanks

19411: cpu/gd32v: add riotboot support r=benpicco a=gschorcht ### Contribution description This PR provides `riotboot` support for GD32V. ### Testing procedure Use any GD32V board with a JTAG adapter and flash the bootloader: ```python PROGRAMMER=openocd BOARD=sipeed-longan-nano make -C bootloaders/riotboot flash ``` Flash slot 0 and set `RIOT_VERSION` to 1 ```python USEMODULE=stdio_uart FEATURES_REQUIRED=riotboot RIOT_VERSION=1 \ PROGRAMMER=openocd BOARD=sipeed-longan-nano make -C tests/shell riotboot/flash-slot0 ... ### Flashing Target ### Binfile detected, adding ROM base address: 0x08000000 Flashing with IMAGE_OFFSET: 0x08001000 ``` ```python > main(): This is RIOT! (Version: 1) test_shell. ``` Flash slot 1 and set `RIOT_VERSION` to 2 ```python USEMODULE=stdio_uart FEATURES_REQUIRED=riotboot RIOT_VERSION=2 \ PROGRAMMER=openocd BOARD=sipeed-longan-nano make -C tests/shell riotboot/flash-slot1 ... ### Flashing Target ### Binfile detected, adding ROM base address: 0x08000000 Flashing with IMAGE_OFFSET: 0x08010800 ``` ```python > main(): This is RIOT! (Version: 2) test_shell. ``` ### Issues/PRs references 19436: cpp11-compat: thread::sleep_for in microseconds r=benpicco a=kfessel ### Contribution description after reviewing #19369 i found that there is a conversion to nanoseconds just to convert it to microseconds some instrunctions later for ztimer64_usec to handle it this removes one of the conversions (convert once direct to microseconds) ### Testing procedure run the cpp tests ### Issues/PRs references #19369 19450: cpu/esp32: fix compilation issues with GCC 12.2 r=benpicco a=gschorcht ### Contribution description This PR provides the changes in `cpu/esp32` and `cpu/esp_common` to fix the compilation issues with GCC v12.2. It is required as the first step in the preparation of the upgrade to ESP-IDF version 5.1. **Please note**: Insead of fixing the ESP-IDF 4.4 code itself by a big bunch of patches to fix the compilation problems with GCC v12.2, it temporarily disables some warnings. The reason is that the ESP-IDF 5.1 requires GCC v12.2 and should be fixed for this compiler version by the vendor. ### Testing procedure Green CI The change were already tested with all ESP-specific modules like `esp_now`, `esp_wifi`, `esp_spi` and `esp_ble` for all supported ESP platforms. ### Issues/PRs references Prerequisite for RIOT-OS/riotdocker#227 Fixes issue #19421 19476: native/syscalls: rename real_clock_gettime to clock_gettime r=benpicco a=Teufelchen1 ### Contribution description When compiling RIOT for native using a recent LLVM and enabling ASAN, one might encounter "Duplicated symbol". This is due to a name clash with `real_clock_gettime()` in compiler-rt from [LLVM](llvm/llvm-project@f50246d), I renamed RIOTs `real_clock_gettime` and just default to the posix function `clock_gettime`. The wrapper existed, most likely, for consistency only. (The best solution would probably to convince the LLVM folks to declare their symbol as `static` and refactor a bit) ### Testing procedure Passing CI should be enough. Co-authored-by: Gunar Schorcht <[email protected]> Co-authored-by: Karl Fessel <[email protected]> Co-authored-by: Teufelchen1 <[email protected]>

19436: cpp11-compat: thread::sleep_for in microseconds r=benpicco a=kfessel ### Contribution description after reviewing #19369 i found that there is a conversion to nanoseconds just to convert it to microseconds some instrunctions later for ztimer64_usec to handle it this removes one of the conversions (convert once direct to microseconds) ### Testing procedure run the cpp tests ### Issues/PRs references #19369 Co-authored-by: Karl Fessel <[email protected]>

MrKevinWeiss requested review from MichelRottleuthner, aabadie, fjmolinas, jia200x, leandrolanzieri and smlng as code owners March 9, 2023 13:09

github-actions bot added Area: Kconfig Area: Kconfig integration Area: sys Area: System Area: tests Area: tests and testing framework labels Mar 9, 2023

benpicco requested a review from kaspar030 March 9, 2023 13:30

benpicco added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Mar 9, 2023

benpicco requested a review from kfessel March 15, 2023 15:15

kfessel reviewed Mar 15, 2023

View reviewed changes

MrKevinWeiss commented Mar 16, 2023

View reviewed changes

kfessel reviewed Mar 16, 2023

View reviewed changes

kfessel reviewed Mar 23, 2023

View reviewed changes

MrKevinWeiss added 3 commits March 24, 2023 12:36

sys/cpp11-compat: Use ztimer64_usec instead of xtimer

4f6448e

tests/cpp11_condition_variable: Use ztimer64_usec instead of xtimer

8e7407e

tests/cpp11_thread: Use ztimer64_usec instead of xtimer

4795965

MrKevinWeiss force-pushed the pr/remove/xtimercpp branch from 9b13727 to 4795965 Compare March 24, 2023 11:37

kfessel approved these changes Mar 24, 2023

View reviewed changes

tests/cpp11_thread: Update BOARD_INSUFFICIENT_MEMORY

95c238a

MrKevinWeiss force-pushed the pr/remove/xtimercpp branch from fbd2fcc to 95c238a Compare March 27, 2023 11:48

bors bot merged commit de8cabc into RIOT-OS:master Mar 27, 2023

MrKevinWeiss deleted the pr/remove/xtimercpp branch March 28, 2023 09:54

kfessel mentioned this pull request Mar 30, 2023

cpp11-compat: thread::sleep_for in microseconds #19436

Merged

MrKevinWeiss added this to the Release 2023.04 milestone Apr 25, 2023

		timeout = s.count() * US_PER_SEC;
		timeout += (duration_cast<microseconds>(timeout_duration - s)).count();

	timeout = s.count() * US_PER_SEC;
	timeout += (duration_cast<microseconds>(timeout_duration - s)).count();
	timeout = duration_cast<microseconds>(timeout_duration).count();

Conversation

MrKevinWeiss commented Mar 9, 2023 • edited by kfessel Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution description

Testing procedure

Issues/PRs references

Uh oh!

riot-ci commented Mar 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Murdock results

Artifacts

Uh oh!

MrKevinWeiss commented Mar 14, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MrKevinWeiss left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kfessel left a comment

Choose a reason for hiding this comment

Uh oh!

MrKevinWeiss commented Mar 24, 2023

Uh oh!

MrKevinWeiss commented Mar 24, 2023

Uh oh!

bors bot commented Mar 24, 2023

Uh oh!

MrKevinWeiss commented Mar 24, 2023

Uh oh!

kfessel commented Mar 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MrKevinWeiss commented Mar 27, 2023

Uh oh!

bors bot commented Mar 27, 2023

Uh oh!

MrKevinWeiss commented Mar 27, 2023

Uh oh!

bors bot commented Mar 27, 2023

Uh oh!

MrKevinWeiss commented Mar 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

MrKevinWeiss commented Mar 9, 2023 •

edited by kfessel

Loading

riot-ci commented Mar 9, 2023 •

edited

Loading

kfessel commented Mar 24, 2023 •

edited

Loading