From 5022e56d6143f5e405af7d12e49a377e35f3bc99 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Tue, 11 Jun 2024 08:05:38 +0200 Subject: [PATCH] Solve conflicts Signed-off-by: Mario Dominguez --- .../fastdds/domain/DomainParticipantImpl.hpp | 2 +- .../fastdds/domain/DomainParticipantImpl.cpp | 76 ------------------- .../fastdds/domain/DomainParticipantImpl.hpp | 76 +------------------ test/blackbox/api/dds-pim/PubSubReader.hpp | 21 ++++- .../fastdds/domain/DomainParticipantImpl.hpp | 2 +- 5 files changed, 21 insertions(+), 156 deletions(-) diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp index c03b7009a5a..8d6879e8a72 100644 --- a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp +++ b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp @@ -293,7 +293,7 @@ class DomainParticipantImpl DomainId_t get_domain_id() const; - ReturnCode_t delete_contained_entities(); + virtual ReturnCode_t delete_contained_entities(); ReturnCode_t assert_liveliness(); diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp index d22d53ec9ad..cb342867142 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp @@ -222,88 +222,12 @@ void DomainParticipantImpl::disable() efd::DomainParticipantImpl::disable(); } -<<<<<<< HEAD -======= ReturnCode_t DomainParticipantImpl::delete_contained_entities() { delete_statistics_builtin_entities(); return efd::DomainParticipantImpl::delete_contained_entities(); } -ReturnCode_t DomainParticipantImpl::enable_monitor_service() -{ - ReturnCode_t ret = efd::RETCODE_OK; - - if (!rtps_participant_->is_monitor_service_created()) - { - status_observer_.store(rtps_participant_->create_monitor_service(*this)); - } - - if (!rtps_participant_->enable_monitor_service() || - nullptr == status_observer_) - { - ret = efd::RETCODE_ERROR; - } - - return ret; -} - -ReturnCode_t DomainParticipantImpl::disable_monitor_service() -{ - ReturnCode_t ret = efd::RETCODE_OK; - - if (!rtps_participant_->is_monitor_service_created() || - !rtps_participant_->disable_monitor_service()) - { - ret = efd::RETCODE_NOT_ENABLED; - } - - return ret; -} - -ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg) -{ - ReturnCode_t ret{efd::RETCODE_OK}; - - if (!get_rtps_participant()->fill_discovery_data_from_cdr_message(data, msg)) - { - ret = efd::RETCODE_ERROR; - } - - return ret; -} - -ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg) -{ - ReturnCode_t ret{efd::RETCODE_OK}; - - if (!get_rtps_participant()->fill_discovery_data_from_cdr_message(data, msg)) - { - ret = efd::RETCODE_ERROR; - } - - return ret; -} - -ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg) -{ - ReturnCode_t ret{efd::RETCODE_OK}; - - if (!get_rtps_participant()->fill_discovery_data_from_cdr_message(data, msg)) - { - ret = efd::RETCODE_ERROR; - } - - return ret; -} - ->>>>>>> 0d62335cc (Properly delete builtin statistics writers upon `delete_contained_entities()` (#4891)) efd::PublisherImpl* DomainParticipantImpl::create_publisher_impl( const efd::PublisherQos& qos, efd::PublisherListener* listener) diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp index 1d96fff57e3..f6da36f90fb 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp @@ -99,8 +99,6 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl static bool is_statistics_topic_name( const std::string& topic_name) noexcept; -<<<<<<< HEAD -======= /** * @brief This override calls the parent method and returns builtin publishers to nullptr * @@ -108,80 +106,8 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl * @note This method is meant to be used followed by a deletion of the participant as it implies * the deletion of the builtin statistics publishers. */ - efd::ReturnCode_t delete_contained_entities() override; + ReturnCode_t delete_contained_entities() override; - /** - * Enables the monitor service in this DomainParticipant. - * - * @return RETCODE_OK if the monitor service could be correctly enabled. - * @return RETCODE_ERROR if the monitor service could not be enabled properly. - * @return RETCODE_UNSUPPORTED if FASTDDS_STATISTICS is not enabled. - * - */ - efd::ReturnCode_t enable_monitor_service(); - - /** - * Disables the monitor service in this DomainParticipant. Does nothing if the service was not enabled before. - * - * @return RETCODE_OK if the monitor service could be correctly disabled. - * @return RETCODE_NOT_ENABLED if the monitor service was not previously enabled. - * @return RETCODE_ERROR if the service could not be properly disabled. - * @return RETCODE_UNSUPPORTED if FASTDDS_STATISTICS is not enabled. - * - */ - efd::ReturnCode_t disable_monitor_service(); - - /** - * fills in the ParticipantProxyData from a MonitorService Message - * - * @param [out] data Proxy to fill - * @param [in] msg MonitorService Message to get the proxy information from. - * - * @return RETCODE_OK if the operation succeeds. - * @return RETCODE_ERROR if the operation fails. - */ - efd::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg); - - /** - * fills in the WriterProxyData from a MonitorService Message - * - * @param [out] data Proxy to fill. - * @param [in] msg MonitorService Message to get the proxy information from. - * - * @return RETCODE_OK if the operation succeeds. - * @return RETCODE_ERROR if the operation fails. - */ - efd::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg); - - /** - * fills in the ReaderProxyData from a MonitorService Message - * - * @param [out] data Proxy to fill. - * @param [in] msg MonitorService Message to get the proxy information from. - * - * @return RETCODE_OK if the operation succeeds. - * @return RETCODE_ERROR if the operation fails. - */ - efd::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg); - - /** - * Gets the status observer for that entity - * - * @return status observer - */ - - const rtps::IStatusObserver* get_status_observer() - { - return status_observer_.load(); - } - ->>>>>>> 0d62335cc (Properly delete builtin statistics writers upon `delete_contained_entities()` (#4891)) protected: /** diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp index 51d72642ca3..a9f4d2f86b2 100644 --- a/test/blackbox/api/dds-pim/PubSubReader.hpp +++ b/test/blackbox/api/dds-pim/PubSubReader.hpp @@ -491,6 +491,18 @@ class PubSubReader return get_last_sequence_received(); } + void startReception( + size_t expected_samples) + { + { + std::unique_lock lock(mutex_); + current_processed_count_ = 0; + number_samples_expected_ = expected_samples; + last_seq.clear(); + } + receiving_.store(true); + } + void stopReception() { receiving_.store(false); @@ -1790,9 +1802,12 @@ class PubSubReader if (info.valid_data && info.instance_state == eprosima::fastdds::dds::ALIVE_INSTANCE_STATE) { - auto it = std::find(total_msgs_.begin(), total_msgs_.end(), data); - ASSERT_NE(it, total_msgs_.end()); - total_msgs_.erase(it); + if (!total_msgs_.empty()) + { + auto it = std::find(total_msgs_.begin(), total_msgs_.end(), data); + ASSERT_NE(it, total_msgs_.end()); + total_msgs_.erase(it); + } ++current_processed_count_; default_receive_print(data); cv_.notify_one(); diff --git a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp index f72eb85a96e..f75f6caf84a 100644 --- a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp +++ b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp @@ -573,7 +573,7 @@ class DomainParticipantImpl return false; } - ReturnCode_t delete_contained_entities() + virtual ReturnCode_t delete_contained_entities() { bool can_be_deleted = true;