niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lock the mutex for every method

Browse source
This commit is contained in:
Esteve Fernandez 2015-05-15 12:43:52 -07:00 • committed by Esteve Fernandez
parent 72a9287185
commit 49fc07dab3
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rclcpp/include/rclcpp/node_impl.hpp
View file

@ -217,6 +217,7 @@ const std::vector<rcl_interfaces::SetParametersResult>
Node::set_parameters(
const std::vector<rcl_interfaces::Parameter> & parameters)
{
std::lock_guard<std::mutex> lock(mutex_);
std::vector<rcl_interfaces::SetParametersResult> results;
for (auto p : parameters) {
parameters_[p.name] = rclcpp::parameter::ParameterVariant::from_parameter(p);
@ -249,6 +250,7 @@ const std::vector<rclcpp::parameter::ParameterVariant>
Node::get_parameters(
const std::vector<std::string> & names)
{
std::lock_guard<std::mutex> lock(mutex_);
std::vector<rclcpp::parameter::ParameterVariant> results;
for (auto & kv : parameters_) {
if (std::any_of(names.cbegin(), names.cend(), [&kv](const std::string & name) {
@ -265,6 +267,7 @@ const std::vector<rcl_interfaces::ParameterDescriptor>
Node::describe_parameters(
const std::vector<std::string> & names)
{
std::lock_guard<std::mutex> lock(mutex_);
std::vector<rcl_interfaces::ParameterDescriptor> results;
for (auto & kv : parameters_) {
if (std::any_of(names.cbegin(), names.cend(), [&kv](const std::string & name) {
@ -284,6 +287,7 @@ const std::vector<uint8_t>
Node::get_parameter_types(
const std::vector<std::string> & names)
{
std::lock_guard<std::mutex> lock(mutex_);
std::vector<uint8_t> results;
for (auto & kv : parameters_) {
if (std::any_of(names.cbegin(), names.cend(), [&kv](const std::string & name) {
@ -302,6 +306,7 @@ const std::vector<rcl_interfaces::ListParametersResult>
Node::list_parameters(
const std::vector<std::string> & prefixes, uint64_t depth)
{
std::lock_guard<std::mutex> lock(mutex_);
std::vector<rcl_interfaces::ListParametersResult> results;
// TODO: define parameter separator, use "." for now