Skip to content

Conversation

@wjwwood
Copy link
Member

@wjwwood wjwwood commented Apr 12, 2024

See: #2494

Which I could not update.

Janosch Machowinski and others added 9 commits April 10, 2024 17:39
Signed-off-by: Janosch Machowinski <[email protected]>
Signed-off-by: Janosch Machowinski <[email protected]>
Before this change, the rebuild of wait set would be triggered
after the wait set was waken up. With bad timing, this could
lead to the rebuild not happening with multi threaded executor.

Signed-off-by: Janosch Machowinski <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Janosch Machowinski <[email protected]>
Signed-off-by: Janosch Machowinski <[email protected]>
Signed-off-by: William Woodall <[email protected]>
@wjwwood wjwwood mentioned this pull request Apr 12, 2024
@wjwwood
Copy link
Member Author

wjwwood commented Apr 12, 2024

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 #2494 (comment):

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:

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

I wasn't able to see any obvious issue, the CI is with my changes in #2500, but locally even this pr's changes have that problem.

@jmachowinski
Copy link
Collaborator

I'll look into it

Janosch Machowinski added 3 commits April 12, 2024 10:09
@mjcarroll
Copy link
Member

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

@wjwwood
Copy link
Member Author

wjwwood commented Apr 12, 2024

lgtm

@wjwwood wjwwood merged commit 90e4511 into rolling Apr 12, 2024
@delete-merged-branch delete-merged-branch bot deleted the wjwwood/data_race_fixes branch April 12, 2024 21:57
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.

5 participants