Correctly clean up arguments structure. #459
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
sloretz
reviewed
Apr 5, 2018
rclcpp/src/rclcpp/utilities.cpp
Outdated
| // Not using throw_from_rcl_error, because we may need to append deallocation failures. | ||
| exceptions::RCLErrorBase base_exec(ret, rcl_get_error_state()); | ||
| rcl_reset_error(); | ||
| if (RCL_RET_OK != rcl_arguments_fini(&parsed_args)) { |
There was a problem hiding this comment.
It looks like rcl_parse_arguments cleans up after itself when something goes wrong. I would expect this call to rcl_arguments_fini to always fail here.
mjcarroll
added
in review
wjwwood
reviewed
Apr 5, 2018
rclcpp/src/rclcpp/utilities.cpp
Outdated
| @@ -241,6 +250,11 @@ rclcpp::remove_ros_arguments(int argc, char const * const argv[]) | |||
| alloc.deallocate(nonros_argv, alloc.state); | |||
| } | |||
|
|
|||
| ret = rcl_arguments_fini(&parsed_args); | |||
| if (RCL_RET_OK != ret) { | |||
| exceptions::throw_from_rcl_error(ret, "failed to cleanup parsed arguments, leaking memory: "); | |||
There was a problem hiding this comment.
Is the : needed in this case? I think this adds it automatically:
rclcpp/rclcpp/src/rclcpp/exceptions.cpp
Line 60 in 45dcd0c
dhood
reviewed
Apr 6, 2018
rclcpp/src/rclcpp/utilities.cpp
Outdated
| rcl_get_error_string_safe(); | ||
| rcl_reset_error(); | ||
| } | ||
| throw base_exec; |
There was a problem hiding this comment.
I think our default behaviour is to throw an RCLError not an RCLErrorBase. I would change this to
throw RCLError(base_exc, "");
rclcpp/src/rclcpp/utilities.cpp
Outdated
| @@ -224,10 +224,19 @@ rclcpp::remove_ros_arguments(int argc, char const * const argv[]) | |||
| &nonros_argv); | |||
|
|
|||
| if (RCL_RET_OK != ret) { | |||
| // Not using throw_from_rcl_error, because we may need to append deallocation failures. | |||
| exceptions::RCLErrorBase base_exec(ret, rcl_get_error_state()); | |||
There was a problem hiding this comment.
unless it's a convention that I haven't seen before, exec doesn't seem like an appropriate variable name (base_exc instead?)
dhood
approved these changes
Apr 6, 2018
wjwwood
approved these changes
Apr 9, 2018
nnmm
pushed a commit
to ApexAI/rclcpp
that referenced
this pull request
Jul 9, 2022
* Add graph test for service clients There were tests for publishers, subscriptions, and services, but not clients. Signed-off-by: Jacob Perron <[email protected]> * Add function for getting clients by node Signed-off-by: Jacob Perron <[email protected]> * Update service client graph test Signed-off-by: Jacob Perron <[email protected]> * Fix doc sentence Signed-off-by: Jacob Perron <[email protected]> * Update docs Signed-off-by: Jacob Perron <[email protected]>
DensoADAS
pushed a commit
to DensoADAS/rclcpp
that referenced
this pull request
Aug 5, 2022
* Consolidate ZSTD utility functions The zstd_compressor and zstd_decompressor implementations had a number of duplicated utility functions between them; this consolidates them into one file. Signed-off-by: P. J. Reed <[email protected]>
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.
Clean up the arguments structure, which was previously leaking.
Connects to #458