Fix thread issues added upstream (backport #56) - #57
Merged
David-LP99 merged 3 commits intoSep 8, 2026
Merged
David-LP99 merged 3 commits into
David-LP99 merged 3 commits into
Conversation
Copy link
Copy Markdown
Sorry, something went wrong.
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> (cherry picked from commit 0d06209) # Conflicts: # CMakeLists.txt
Copy link
Copy Markdown
Author
|
Cherry-pick of 0d06209 has failed: On branch mergify/bp/lyrical/pr-56 Your branch is up to date with 'origin/lyrical'. You are currently cherry-picking commit 0d06209. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: CMakeLists.txt no changes added to commit (use "git add" and/or "git commit -a") To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Sorry, something went wrong.
Copy link
Copy Markdown
Author
|
Tick the box to add this pull request to the merge queue (same as @mergifyio queue).
|
Sorry, something went wrong.
Copy link
Copy Markdown
|
The PR ros2#579 was not merged into lyrical, so that part of the fix is not needed here and caused conflicts. |
Sorry, something went wrong.
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
David-LP99
added a commit
that referenced
this pull request
Sep 8, 2026
* micro-ROS changes over dashing * Added and updated security directory (#1) * RCUTILS_NO_FILESYSTEM and RCUTILS_AVOID_DYNAMIC_ALLOCATION (#2) - No filesystem options; default allocators write access - Avoid dynamic allocation and no filesystem on error handling - Error handling template; new allocator approach * Add test_security_directory test from rcl (#3) * Zephyr fixes (#4) * CMake refactor (#5) * Update approach (#6) - Remove target_compile_definitions and refactor flags install - Added RCUTILS_NO_FILESYSTEM on new functions * Updates 17092020 * Fix atomics 64bits (#9) - Add hashing and lock pool * Updates 09102020 * Release micro-ROS Foxy (#8) - Update filesystem; adjust logger level; cleaning * Remove build warning (#10) - avoid not used warnings * Reduce error handling static size (#14) (#15) * Revert "Revert "Install headers to include/${PROJECT_NAME} (ros2#351)"" * Fix atomic 64 b description (#17) (#18) * Add fork checker for humble * Don't link dl library when not needed (#28) * Revert "Set hints to find the python version we actually want. (ros2#451)" * Fix struct tm init * Add PRId64 * Don't export dl library when not used (#33) (#34) * Remove unnecessary folder (#42) * Update CI (backport #43) (#46) - Add CI and nightly for each distro; update git version; skip tests - Change nightly to weekly; change master to rolling in fork checker * Add RCUTILS_NO_PROCESS_SUPPORT option to build without fork/exec/wait (#50) * Update CI (#51) * Fix thread issues added upstream (backport #56) (#57) Dropped during the rebase as superseded by upstream: * Don't export dl library when not used (#33) (#34) Co-authored-by: Pablo Garrido <pablogs9@gmail.com> Co-authored-by: Jose Antonio Moral <joseantoniomoralparras@gmail.com> Co-authored-by: Blazej Sowa <bsowa123@gmail.com> Co-authored-by: Anton Casas <antoncasas@eprosima.com> Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com> Co-authored-by: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com> Co-authored-by: Jimmy McElwain <jimmy.mcelwain@motoman.com> Signed-off-by: David Laseca <davidlaseca@eprosima.com>
David-LP99
added a commit
that referenced
this pull request
Sep 8, 2026
* micro-ROS changes over dashing * Added and updated security directory (#1) * RCUTILS_NO_FILESYSTEM and RCUTILS_AVOID_DYNAMIC_ALLOCATION (#2) - No filesystem options; default allocators write access - Avoid dynamic allocation and no filesystem on error handling - Error handling template; new allocator approach * Add test_security_directory test from rcl (#3) * Zephyr fixes (#4) * CMake refactor (#5) * Update approach (#6) - Remove target_compile_definitions and refactor flags install - Added RCUTILS_NO_FILESYSTEM on new functions * Updates 17092020 * Fix atomics 64bits (#9) - Add hashing and lock pool * Updates 09102020 * Release micro-ROS Foxy (#8) - Update filesystem; adjust logger level; cleaning * Remove build warning (#10) - avoid not used warnings * Reduce error handling static size (#14) (#15) * Revert "Revert "Install headers to include/${PROJECT_NAME} (ros2#351)"" * Fix atomic 64 b description (#17) (#18) * Add fork checker for humble * Don't link dl library when not needed (#28) * Revert "Set hints to find the python version we actually want. (ros2#451)" * Fix struct tm init * Add PRId64 * Don't export dl library when not used (#33) (#34) * Remove unnecessary folder (#42) * Update CI (backport #43) (#46) - Add CI and nightly for each distro; update git version; skip tests - Change nightly to weekly; change master to rolling in fork checker * Add RCUTILS_NO_PROCESS_SUPPORT option to build without fork/exec/wait (#50) * Update CI (#51) * Fix thread issues added upstream (backport #56) (#57) * Fix weekly CI (backport #58) (#60) Dropped during the rebase as superseded by upstream: * Don't export dl library when not used (#33) (#34) Co-authored-by: Pablo Garrido <pablogs9@gmail.com> Co-authored-by: Jose Antonio Moral <joseantoniomoralparras@gmail.com> Co-authored-by: Blazej Sowa <bsowa123@gmail.com> Co-authored-by: Anton Casas <antoncasas@eprosima.com> Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com> Co-authored-by: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com> Co-authored-by: Jimmy McElwain <jimmy.mcelwain@motoman.com> Signed-off-by: David Laseca <davidlaseca@eprosima.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR aims to deal with two changes involving threads from upstream.
The base64 encode and decode functionality added in ros2#533 for configuring binary data in YAML files is not needed in micro-ROS. It's only reference at the moment comes from rcl_yaml_param_parser, which is also disabled in micro-ROS.
In ros2#579, it was also added a dependency on pthreads, which is not used anywere else in micro-ROS and should be gated on RCUTILS_NO_THREAD_SUPPORT.
Main changes
This is an automatic backport of pull request #56 done by [Mergify](https://mergify.com).