-
Notifications
You must be signed in to change notification settings - Fork 456
set thread names by node in component container isolated #2871
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
Open
Aposhian
wants to merge
9
commits into
ros2:rolling
Choose a base branch
from
fireflyautomatix:2818-custom-thread-names
base: rolling
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+11
−2
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6cb3050
set thread names by node in component container isolated
Aposhian 3967b72
fix formatting
Aposhian cc18cde
add get_thread_name and tests
Aposhian 26a8a9b
remove unnecessary include
Aposhian 4adb111
fix cpplint errors
Aposhian 3dc401d
fix formatting
Aposhian 408d136
throw with os error info
Aposhian d2ab71c
use rcpputils thread name utils
Aposhian 7bf01ce
add system_error include
Aposhian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,9 +22,10 @@ | |
#include <utility> | ||
#include <vector> | ||
#include <unordered_map> | ||
#include <system_error> | ||
|
||
#include "rclcpp_components/component_manager.hpp" | ||
|
||
#include "rcpputils/thread_name.hpp" | ||
|
||
namespace rclcpp_components | ||
{ | ||
|
@@ -77,8 +78,16 @@ class ComponentManagerIsolated : public rclcpp_components::ComponentManager | |
DedicatedExecutorWrapper & wrapper = result.first->second; | ||
wrapper.executor = exec; | ||
auto & thread_initialized = wrapper.thread_initialized; | ||
auto name = node_wrappers_[node_id].get_node_base_interface()->get_name(); | ||
// Copy name so that it doesn't deallocate before the thread is started | ||
wrapper.thread = std::thread( | ||
[exec, &thread_initialized]() { | ||
[exec, &thread_initialized, name]() { | ||
try { | ||
rcpputils::set_thread_name(name); | ||
} catch (const std::system_error & e) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. include There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
RCLCPP_WARN(rclcpp::get_logger("rclcpp"), "Failed to set thread name: %s (%s)", e.what(), | ||
e.code().message().c_str()); | ||
} | ||
thread_initialized = true; | ||
exec->spin(); | ||
}); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we would want to add the docstring about this behavior including truncating the node name into 16bytes depending on the platform? it also can mention that if using MultiThreadedExecutor, all the threads in that will be named same.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean to the docstring of
set_thread_name
or elsewhere?