Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Make use of error return value in decrement_context_impl_ref_count #488

Merged
merged 2 commits into from Nov 23, 2020
Merged

Make use of error return value in decrement_context_impl_ref_count #488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bce27ce
Make use of error return value in decrement_context_impl_ref_count
brawner Nov 20, 2020
349791c
Switch logic to early return
brawner Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
130 changes: 66 additions & 64 deletions rmw_fastrtps_shared_cpp/src/init_rmw_context_impl.cpp
View file
Open in desktop
Expand Up @@ -39,69 +39,71 @@ rmw_fastrtps_shared_cpp::decrement_context_impl_ref_count(rmw_context_t * contex
assert(context->impl);
assert(0u < context->impl->count);

if (0u == --context->impl->count) {
rmw_ret_t err = RMW_RET_OK;
rmw_ret_t ret = RMW_RET_OK;
rmw_error_string_t error_string;

ret = rmw_fastrtps_shared_cpp::join_listener_thread(context);
if (RMW_RET_OK != ret) {
return ret;
}

auto common_context = static_cast<rmw_dds_common::Context *>(context->impl->common);
auto participant_info = static_cast<CustomParticipantInfo *>(context->impl->participant_info);

if (!common_context->graph_cache.remove_participant(common_context->gid)) {
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__line__) ": "
"couldn't remove Participant gid from graph_cache when destroying Participant");
}

ret = rmw_fastrtps_shared_cpp::destroy_subscription(
context->implementation_identifier,
participant_info,
common_context->sub);
// Try to clean the other objects if the above failed.
if (RMW_RET_OK != ret) {
error_string = rmw_get_error_string();
rmw_reset_error();
}
err = rmw_fastrtps_shared_cpp::destroy_publisher(
context->implementation_identifier,
participant_info,
common_context->pub);
if (RMW_RET_OK != ret && RMW_RET_OK != err) {
// We can just return one error, log about the previous one.
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__LINE__)
": 'destroy_subscription' failed\n");
ret = err;
error_string = rmw_get_error_string();
rmw_reset_error();
}
err = rmw_fastrtps_shared_cpp::destroy_participant(participant_info);
if (RMW_RET_OK != ret && RMW_RET_OK != err) {
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__LINE__)
": 'destroy_publisher' failed\n");
ret = err;
} else if (RMW_RET_OK != ret) {
RMW_SET_ERROR_MSG(error_string.str);
}

common_context->graph_cache.clear_on_change_callback();
if (RMW_RET_OK != rmw_fastrtps_shared_cpp::__rmw_destroy_guard_condition(
common_context->graph_guard_condition))
{
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__line__) ": "
"couldn't destroy graph_guard_condtion");
}

delete common_context;
context->impl->common = nullptr;
context->impl->participant_info = nullptr;
if (--context->impl->count > 0) {
return RMW_RET_OK;
}
return RMW_RET_OK;

rmw_ret_t err = RMW_RET_OK;
rmw_ret_t ret = RMW_RET_OK;
rmw_error_string_t error_string;

ret = rmw_fastrtps_shared_cpp::join_listener_thread(context);
if (RMW_RET_OK != ret) {
return ret;
}

auto common_context = static_cast<rmw_dds_common::Context *>(context->impl->common);
auto participant_info = static_cast<CustomParticipantInfo *>(context->impl->participant_info);

if (!common_context->graph_cache.remove_participant(common_context->gid)) {
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__line__) ": "
"couldn't remove Participant gid from graph_cache when destroying Participant");
}

ret = rmw_fastrtps_shared_cpp::destroy_subscription(
context->implementation_identifier,
participant_info,
common_context->sub);
// Try to clean the other objects if the above failed.
if (RMW_RET_OK != ret) {
error_string = rmw_get_error_string();
rmw_reset_error();
}
err = rmw_fastrtps_shared_cpp::destroy_publisher(
context->implementation_identifier,
participant_info,
common_context->pub);
if (RMW_RET_OK != ret && RMW_RET_OK != err) {
// We can just return one error, log about the previous one.
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__LINE__)
": 'destroy_subscription' failed\n");
ret = err;
error_string = rmw_get_error_string();
rmw_reset_error();
}
err = rmw_fastrtps_shared_cpp::destroy_participant(participant_info);
if (RMW_RET_OK != ret && RMW_RET_OK != err) {
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__LINE__)
": 'destroy_publisher' failed\n");
ret = err;
} else if (RMW_RET_OK != ret) {
RMW_SET_ERROR_MSG(error_string.str);
}

common_context->graph_cache.clear_on_change_callback();
if (RMW_RET_OK != rmw_fastrtps_shared_cpp::__rmw_destroy_guard_condition(
common_context->graph_guard_condition))
{
RMW_SAFE_FWRITE_TO_STDERR(
RCUTILS_STRINGIFY(__function__) ":" RCUTILS_STRINGIFY(__line__) ": "
"couldn't destroy graph_guard_condtion");
}

delete common_context;
context->impl->common = nullptr;
context->impl->participant_info = nullptr;
return ret;
}