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

Enable manual_by_node and node liveliness assertion #298

Merged
merged 1 commit into from
Jul 2, 2019
Merged

Enable manual_by_node and node liveliness assertion #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions rmw_fastrtps_shared_cpp/src/qos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,8 @@ get_datawriter_qos(
}

bool
is_valid_qos(const rmw_qos_profile_t & qos_policies)
is_valid_qos(const rmw_qos_profile_t & /* qos_policies */)
{
if (qos_policies.liveliness == RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_NODE) {
RMW_SET_ERROR_MSG("Liveliness policy MANUAL_BY_NODE is not yet supported for fastrtps.");
return false;
}
return true;
}

Expand Down
6 changes: 2 additions & 4 deletions rmw_fastrtps_shared_cpp/src/rmw_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,8 @@ __rmw_node_assert_liveliness(
return RMW_RET_ERROR;
}

// node_info->participant->assert_liveliness();
RMW_SET_ERROR_MSG("assert_liveliness() of node is currently not supported");

return RMW_RET_UNSUPPORTED;
node_info->participant->assert_liveliness();
return RMW_RET_OK;
}

const rmw_guard_condition_t *
Expand Down