search

ros2 / rclcpp

rclcpp (ROS Client Library for C++)
Apache License 2.0
514 stars 410 forks source link

[wjwwood] Updated "Data race fixes" #2500

Closed wjwwood closed 2 months ago

wjwwood commented 2 months ago

See: https://github.com/ros2/rclcpp/pull/2494

Which I could not update.

wjwwood commented 2 months ago

Fixed the conflicts due to other merges, @jmachowinski can you have a look at executor.cpp to make sure I didn't muck up the merge conflicts?

also, copying from https://github.com/ros2/rclcpp/pull/2494#issuecomment-2051680519:

On my machine, the test TestAddCallbackGroupsToExecutor/StaticSingleThreadedExecutor.add_callback_groups_after_add_node_to_executor (for all rmw implementations) is timing out.

The following tests FAILED:
     28 - test_add_callback_groups_to_executor__rmw_cyclonedds_cpp (Timeout)
     29 - test_add_callback_groups_to_executor__rmw_fastrtps_cpp (Timeout)
     30 - test_add_callback_groups_to_executor__rmw_fastrtps_dynamic_cpp (Timeout)

I'll run CI just to confirm:

I wasn't able to see any obvious issue, the CI is with my changes in https://github.com/ros2/rclcpp/pull/2500, but locally even this pr's changes have that problem.

jmachowinski commented 2 months ago

I'll look into it

mjcarroll commented 2 months ago
wjwwood commented 2 months ago

lgtm