Get node names and namespaces #545
Merged
Conversation
This file contains 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
wjwwood
reviewed
Aug 29, 2018
| if (ret != RCL_RET_OK) { | ||
| auto error_msg = std::string("failed to get node names: ") + rcl_get_error_string_safe(); | ||
| rcl_reset_error(); | ||
| if (rcutils_string_array_fini(&node_names_c) != RCUTILS_RET_OK) { | ||
| error_msg += std::string(", failed also to cleanup node names, leaking memory: ") + | ||
| rcl_get_error_string_safe(); | ||
| } | ||
| if (rcutils_string_array_fini(&node_namespaces_c) != RCUTILS_RET_OK) { | ||
| error_msg += std::string(", failed also to cleanup node namespaces, leaking memory: ") + | ||
| rcl_get_error_string_safe(); |
There was a problem hiding this comment.
This wasn't being done in the existing code either, but you should reset the error with rcl_reset_error().
| ret = rcutils_string_array_fini(&node_namespaces_c); | ||
| if (ret != RCUTILS_RET_OK) { | ||
| // *INDENT-OFF* | ||
| // TODO(karsten1987): Append rcutils_error_message once it's in master |
There was a problem hiding this comment.
I don't really understand this TODO (copied here or from the original) @Karsten1987 can you explain?
| @@ -163,10 +183,19 @@ NodeGraph::get_node_names() const | |||
| std::string("could not destroy node names: ")); | |||
There was a problem hiding this comment.
This exception should only be thrown after trying to fini the node_namespaces_c struct as well.
|
|
||
| return node_names; | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
nitpick: Seems like unnecessary vertical whitepsace (https://google.github.io/styleguide/cppguide.html#Vertical_Whitespace)
wjwwood
approved these changes
Sep 1, 2018
mjcarroll
force-pushed
the
get_node_names_and_namespaces
branch
from
918900c
to
e4a2ee7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add a new method to return a vector of pair to get both node names and namespaces.
Connects to ros2/rmw#142