Skip to content

Commit

Permalink
Define default history depth
Browse files Browse the repository at this point in the history
Signed-off-by: Yadunund <[email protected]>
  • Loading branch information
Yadunund committed Jan 31, 2024
1 parent 2ad493d commit 1298abd
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions rmw_zenoh_cpp/src/rmw_zenoh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@

#include "rmw_dds_common/qos.hpp"

#define RMW_ZENOH_DEFAULT_HISTORY_DEPTH 1;

namespace
{

Expand Down Expand Up @@ -1286,10 +1288,11 @@ rmw_create_subscription(
RMW_SET_ERROR_MSG("Failed to obtain adapted_qos_profile.");
return nullptr;
}
// Explicitly ensure the history depth is at least 1.
sub_data->adapted_qos_profile.depth = std::max(
static_cast<std::size_t>(1),
sub_data->adapted_qos_profile.depth);
// If a depth of 0 was provided, the RMW implementation can set the depth to a default.
sub_data->adapted_qos_profile.depth =
sub_data->adapted_qos_profile.depth > 0 ?
sub_data->adapted_qos_profile.depth :
RMW_ZENOH_DEFAULT_HISTORY_DEPTH;

sub_data->typesupport_identifier = type_support->typesupport_identifier;
sub_data->type_support_impl = type_support->data;
Expand Down Expand Up @@ -2546,7 +2549,6 @@ rmw_create_service(
service_data->adapted_qos_profile =
rmw_dds_common::qos_profile_update_best_available_for_services(*qos_profiles);


// Get the RMW type support.
const rosidl_service_type_support_t * type_support = find_service_type_support(type_supports);
if (type_support == nullptr) {
Expand Down

0 comments on commit 1298abd

Please sign in to comment.