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

remove unused data structure for which unprotected concurrent access was causing segfaults and deadlocks on OSX

Browse source
This commit is contained in:
Brian Gerkey 2015-12-17 19:06:28 -08:00
parent 7422cda6c6
commit a7a61119fd
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rclcpp/include/rclcpp/executors/multi_threaded_executor.hpp
View file

@ -61,7 +61,6 @@ private:
std::mutex wait_mutex_; std::mutex wait_mutex_;
size_t number_of_threads_; size_t number_of_threads_;
std::unordered_map<std::thread::id, size_t> thread_number_by_thread_id_;
}; };
} // namespace multi_threaded_executor } // namespace multi_threaded_executor

3
rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp
View file

@ -64,9 +64,8 @@ MultiThreadedExecutor::get_number_of_threads()
} }
void void
MultiThreadedExecutor::run(size_t this_thread_number) MultiThreadedExecutor::run(size_t)
{ {
thread_number_by_thread_id_[std::this_thread::get_id()] = this_thread_number;
while (rclcpp::utilities::ok() && spinning.load()) { while (rclcpp::utilities::ok() && spinning.load()) {
executor::AnyExecutable::SharedPtr any_exec; executor::AnyExecutable::SharedPtr any_exec;
{ {