Skip to content

[Backport] Fix action server deadlock (#1285) (#1313) #1518

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.

Sign up for GitHub

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

Merged
jacobperron merged 3 commits into from
Jan 20, 2021
Merged

[Backport] Fix action server deadlock (#1285) (#1313) #1518

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80c15f9
Add missing locking to the rclcpp_action::ServerBase. (#1421)
clalancette Oct 27, 2020
83a45b5
[backport] Fix action server deadlock (#1285, #1313)
daisukes Jan 15, 2021
fab2bfe
revert comment
daisukes Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/experimental/intra_process_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class IntraProcessManager
sub_ids.take_shared_subscriptions.size() <= 1)
{
// There is at maximum 1 buffer that does not require ownership.
// So we this case is equivalent to all the buffers requiring ownership
// So this case is equivalent to all the buffers requiring ownership
Comment thread
jacobperron marked this conversation as resolved.
Outdated

// Merge the two vector of ids into a unique one
std::vector<uint64_t> concatenated_vector(sub_ids.take_shared_subscriptions);
Expand Down
Loading