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.

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

Jump to bottom

Add resources_lock_ lock_guards to avoid race condition when loading robot_description through topic (backport #1451) #1600

Merged
merged 7 commits into from
Oct 13, 2024
Merged

Add resources_lock_ lock_guards to avoid race condition when loading robot_description through topic (backport #1451) #1600

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2041a87
Add resources_lock_ lock_guards to avoid race condition when loading …
saikishor Jul 1, 2024
7bdfba7
Fix merge conflicts
christophfroehlich Jul 30, 2024
15a7d5f
Fix format
christophfroehlich Jul 30, 2024
2a46768
Merge branch 'iron' into mergify/bp/iron/pr-1451
christophfroehlich Jul 30, 2024
ff32539
Merge branch 'iron' into mergify/bp/iron/pr-1451
christophfroehlich Aug 14, 2024
61d0374
Merge branch 'iron' into mergify/bp/iron/pr-1451
destogl Aug 15, 2024
eeb4f73
Merge branch 'iron' into mergify/bp/iron/pr-1451
christophfroehlich Oct 13, 2024
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: 2 additions & 0 deletions hardware_interface/src/resource_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,7 @@ void ResourceManager::load_urdf(
const auto hardware_info = hardware_interface::parse_control_resources_from_urdf(urdf);
if (load_and_initialize_components)
{
std::lock_guard<std::recursive_mutex> resource_guard(resources_lock_);
for (const auto & individual_hardware_info : hardware_info)
{
if (individual_hardware_info.type == actuator_type)
Expand Down Expand Up @@ -1287,6 +1288,7 @@ return_type ResourceManager::set_component_state(
return false;
};

std::lock_guard<std::recursive_mutex> guard(resources_lock_);
bool found = find_set_component_state(
std::bind(&ResourceStorage::set_component_state<Actuator>, resource_storage_.get(), _1, _2),
resource_storage_->actuators_);
Expand Down
Loading