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

[wjwwood] Updated "Data race fixes" #2500

Merged
merged 13 commits into from
Apr 12, 2024
Merged

[wjwwood] Updated "Data race fixes" #2500

merged 13 commits into from
Apr 12, 2024

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 <j.machowinski@cellumation.com>
Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
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 <J.Machowinski@cellumation.com>
Signed-off-by: Janosch Machowinski <j.machowinski@cellumation.com>
Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Janosch Machowinski <j.machowinski@nospam.org>
Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Signed-off-by: William Woodall <william@osrfoundation.org>
Signed-off-by: William Woodall <william@osrfoundation.org>
@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
Contributor

I'll look into it

Janosch Machowinski added 3 commits April 12, 2024 10:09
Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
…g for current_notify_waitable_

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
@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
3 checks passed
@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.

None yet

4 participants