Skip to content

Fixes in rmw_wait (backport #895) - #916

Merged
jmachowinski merged 1 commit into
kiltedfrom
mergify/bp/kilted/pr-895
Sep 10, 2026
Merged

jmachowinski merged 1 commit into
kiltedfrom
mergify/bp/kilted/pr-895

Conversation

@mergify

@mergify mergify Bot commented Sep 8, 2026

Copy link
Copy Markdown

Description

This fixes two things in rmw_wait:

  • A race where a guard condition is triggered while traversing the collection of guard conditions, and is then untriggered during said traversal
  • RMW_RET_TIMEOUT being returned when an element becomes ready after the wait set timed out

Is this user-facing behavior change?

Did you use Generative AI?

Additional Information

Related regression test in ros2/rmw_implementation#280


This is an automatic backport of pull request #895 done by Mergify.

* fix: Fix race condition when untriggering guard conditions.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* fix: return `RMW_RET_OK` whenever an active element is returned

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* style: uncrustify

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 83471d4)
@mergify mergify Bot mentioned this pull request Sep 8, 2026
@jmachowinski

Copy link
Copy Markdown

Pulls: #916
Gist: https://gist.githubusercontent.com/jmachowinski/ebfa3e7877e3e21e9da9b20bc212c9f0/raw/aee9e42e33457c14002878808f2e0228678b0a0f/ros2.repos
BUILD args:
TEST args:
ROS Distro: rolling
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/20375

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde

ahcorde commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Pulls: #916
Gist: https://gist.githubusercontent.com/ahcorde/1aece1b7f1e04cdab5815ebc4d7169e7/raw/b0e599e7e56b0faa78d8fc0ed2d27aac231dcf9a/ros2.repos
BUILD args: --packages-above-and-dependencies rmw_fastrtps_shared_cpp
TEST args: --packages-above rmw_fastrtps_shared_cpp
ROS Distro: kilted
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/20394

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@jmachowinski
jmachowinski merged commit 2fa7900 into kilted Sep 10, 2026
2 checks passed
@ahcorde
ahcorde deleted the mergify/bp/kilted/pr-895 branch September 10, 2026 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants