Change activate to check if there are discovered types for topic pref…

…ix and adapt tests Signed-off-by: Lucia Echevarria <[email protected]>
eProsima · Oct 8, 2024 · 22e8d05 · 22e8d05
1 parent e899632
commit 22e8d05
Show file tree

Hide file tree

Showing 4 changed files with 207 additions and 186 deletions.
diff --git a/fastddsspy_participants/include/fastddsspy_participants/model/DataStreamer.hpp b/fastddsspy_participants/include/fastddsspy_participants/model/DataStreamer.hpp
@@ -54,6 +54,7 @@ class DataStreamer : public TopicRateCalculator
     FASTDDSSPY_PARTICIPANTS_DllAPI
     bool activate(
             const ddspipe::core::types::WildcardDdsFilterTopic& topic_to_activate,
+            const std::set<eprosima::ddspipe::core::types::DdsTopic>& topics,
             const std::shared_ptr<CallbackType>& callback);
 
     FASTDDSSPY_PARTICIPANTS_DllAPI
@@ -71,20 +72,20 @@ class DataStreamer : public TopicRateCalculator
 
     FASTDDSSPY_PARTICIPANTS_DllAPI
     bool is_topic_type_discovered(
-            const ddspipe::core::types::WildcardDdsFilterTopic& topic_to_activate) const noexcept;
+            const ddspipe::core::types::DdsTopic& topic_to_activate) const noexcept;
 
     FASTDDSSPY_PARTICIPANTS_DllAPI
-    bool is_topic_type_discovered(
-            const ddspipe::core::types::DdsTopic& topic_to_activate) const noexcept;
+    bool is_any_topic_type_discovered(
+            const std::set<eprosima::ddspipe::core::types::DdsTopic>& topics) const noexcept;
 
 protected:
 
-    bool is_topic_type_discovered_nts_(
-            const ddspipe::core::types::WildcardDdsFilterTopic& topic_to_activate) const noexcept;
-
     bool is_topic_type_discovered_nts_(
             const ddspipe::core::types::DdsTopic& topic_to_activate) const noexcept;
 
+    bool is_any_topic_type_discovered_nts_(
+            const std::set<eprosima::ddspipe::core::types::DdsTopic>& topics) const noexcept;
+
     bool activated_ {false};
 
     std::shared_ptr<CallbackType> callback_;

diff --git a/fastddsspy_participants/src/cpp/model/DataStreamer.cpp b/fastddsspy_participants/src/cpp/model/DataStreamer.cpp
@@ -43,9 +43,10 @@ bool DataStreamer::activate_all(
 
 bool DataStreamer::activate(
         const ddspipe::core::types::WildcardDdsFilterTopic& topic_to_activate,
+        const std::set<eprosima::ddspipe::core::types::DdsTopic>& topics,
         const std::shared_ptr<CallbackType>& callback)
 {
-    if (!is_topic_type_discovered(topic_to_activate))
+    if (!is_any_topic_type_discovered(topics))
     {
         EPROSIMA_LOG_WARNING(FASTDDSSPY_DATASTREAMER,
                 "Type <" << topic_to_activate.type_name <<
@@ -157,40 +158,38 @@ void DataStreamer::add_data(
 }
 
 bool DataStreamer::is_topic_type_discovered(
-        const ddspipe::core::types::WildcardDdsFilterTopic& filter_topic) const noexcept
+        const ddspipe::core::types::DdsTopic& topic) const noexcept
 {
     std::shared_lock<std::shared_timed_mutex> _(mutex_);
-    return is_topic_type_discovered_nts_(filter_topic);
+    return is_topic_type_discovered_nts_(topic);
 }
 
 bool DataStreamer::is_topic_type_discovered_nts_(
-        const ddspipe::core::types::WildcardDdsFilterTopic& filter_topic) const noexcept
+        const ddspipe::core::types::DdsTopic& topic) const noexcept
 {
-    ddspipe::core::types::DdsTopic topic;
-    for (const auto& it : topic_type_discovered_)
-    {
-        topic.m_topic_name = it.first;
-        topic.type_name = it.second;
-        if (filter_topic.matches(topic) == true)
-        {
-            return true;
-        }
-    }
-
-    return false;
+    return types_discovered_.find(topic.type_name) != types_discovered_.end();
 }
 
-bool DataStreamer::is_topic_type_discovered(
-        const ddspipe::core::types::DdsTopic& topic) const noexcept
+bool DataStreamer::is_any_topic_type_discovered(
+        const std::set<eprosima::ddspipe::core::types::DdsTopic>& topics) const noexcept
 {
     std::shared_lock<std::shared_timed_mutex> _(mutex_);
-    return is_topic_type_discovered_nts_(topic);
+    return is_any_topic_type_discovered_nts_(topics);
 }
 
-bool DataStreamer::is_topic_type_discovered_nts_(
-        const ddspipe::core::types::DdsTopic& topic) const noexcept
+bool DataStreamer::is_any_topic_type_discovered_nts_(
+        const std::set<eprosima::ddspipe::core::types::DdsTopic>& topics) const noexcept
 {
-    return types_discovered_.find(topic.type_name) != types_discovered_.end();
+    for (const auto& topic : topics)
+    {
+        if (types_discovered_.find(topic.type_name) != types_discovered_.end())
+        {
+            // If there's at least one topic that matches the filter topic return true
+            return true;
+        }
+    }
+
+    return false;
 }
 
 } /* namespace participants */