Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improved rcl_wait in the area of timeout computation and spurious wakeups #1146

Merged
merged 3 commits into from
Apr 3, 2024

Conversation

jmachowinski
Copy link
Contributor

This fixes the issues reported by #1142.

Fixed a bug that a ready override timer would not wake up the wait set.

Adopted the test to catch this condition.

@clalancette, @mjcarroll , @fujitatomoya , @wjwwood

Janosch Machowinski added 2 commits March 31, 2024 12:18
Signed-off-by: Janosch Machowinski <j.machowinski@nospam.org>
Signed-off-by: Janosch Machowinski <j.machowinski@nospam.org>
Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

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

lgtm. i think this should work for failed cases https://ci.ros2.org/job/ci_linux/20668/testReport/.

@jmachowinski thank you very much for your effort including weekend!

I will start the CI. (I will exclude ros2/rclcpp#2469, to verify this specific PR 1st.)

rcl/src/rcl/wait.c Show resolved Hide resolved
@fujitatomoya
Copy link
Collaborator

CI:

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

Added special handling for timers with a clock that has time override
enabled. For these timer we should not compute a timeout, as the waitset
is waken up by the associated guard condition.
Before this change, the waitset could wait up, because of an expected ready
timer, that was acutally not ready, as the time update to the ROS_TIME had
not yet arrived.

Signed-off-by: Janosch Machowinski <j.machowinski@nospam.org>
@jmachowinski
Copy link
Contributor Author

fixed the linting problem

@jmachowinski jmachowinski force-pushed the timer_imporvements2 branch from 10bb656 to 3191f3a Compare April 2, 2024 10:16
@fujitatomoya
Copy link
Collaborator

Full CI: (ros2/rclcpp#2469 is already merged)

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

@fujitatomoya
Copy link
Collaborator

@mjcarroll mjcarroll merged commit db366ac into ros2:rolling Apr 3, 2024
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants