Refactor some asserts to conditional expressions

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

Author: rsanchez15

include/fastdds_statistics_backend/listener/DomainListener.hpp

@@ -75,9 +75,11 @@ class FASTDDS_STATISTICS_BACKEND_DllAPI DomainListener
 
         void on_instance_undiscovered()
         {
-            assert (current_count > 0);
-            --current_count;
-            --current_count_change;
+            if (current_count > 0)
+            {
+                --current_count;
+                --current_count_change;
+            }
         }
 
         void on_status_read()

src/cpp/StatisticsBackendData.cpp

@@ -25,6 +25,7 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
+#include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
@@ -122,7 +123,10 @@ void StatisticsBackendData::on_data_available(
         DataKind data_kind)
 {
     auto monitor = monitors_by_entity_.find(domain_id);
-    assert(monitor != monitors_by_entity_.end());
+    if (monitor == monitors_by_entity_.end())
+    {
+        return;
+    }
 
     if (should_call_domain_listener(*monitor->second, CallbackKind::ON_DATA_AVAILABLE, data_kind))
     {
@@ -140,7 +144,10 @@ void StatisticsBackendData::on_status_reported(
         StatusKind status_kind)
 {
     auto monitor = monitors_by_entity_.find(domain_id);
-    assert(monitor != monitors_by_entity_.end());
+    if (monitor == monitors_by_entity_.end())
+    {
+        return;
+    }
 
     if (should_call_domain_listener(*monitor->second, CallbackKind::ON_STATUS_REPORTED))
     {
@@ -228,7 +235,11 @@ void StatisticsBackendData::on_domain_entity_discovery(
         DiscoveryStatus discovery_status)
 {
     auto monitor = monitors_by_entity_.find(domain_id);
-    assert(monitor != monitors_by_entity_.end());
+    if (monitor == monitors_by_entity_.end())
+    {
+        return;
+    }
+
     switch (entity_kind)
     {
         case EntityKind::PARTICIPANT:
@@ -306,7 +317,7 @@ void StatisticsBackendData::on_domain_entity_discovery(
         }
         default:
         {
-            assert(false && "Invalid domain entity kind");
+            logWarning(STATISTICS_BACKEND, "Invalid domain entity kind");
         }
     }
 }
@@ -316,7 +327,10 @@ void StatisticsBackendData::on_physical_entity_discovery(
         EntityKind entity_kind,
         DiscoveryStatus discovery_status)
 {
-    assert(discovery_status != DiscoveryStatus::UPDATE);
+    if (discovery_status == DiscoveryStatus::UPDATE)
+    {
+        return;
+    }
 
     switch (entity_kind)
     {
@@ -370,7 +384,7 @@ void StatisticsBackendData::on_physical_entity_discovery(
         }
         default:
         {
-            assert(false && "Invalid physical entity kind");
+            logWarning(STATISTICS_BACKEND, "Invalid physical entity kind");
         }
     }
 }

src/cpp/database/database_queue.cpp

@@ -191,7 +191,11 @@ EntityId DatabaseEntityQueue::process_datareader(
         try
         {
             participant_id = database_->get_entity_by_guid(EntityKind::PARTICIPANT, to_string(participant_guid));
-            assert(participant_id.first == info.domain_id);
+            if (participant_id.first != info.domain_id)
+            {
+                throw BadParameter("Participant " + to_string(participant_guid)
+                          +  " found in the database but it is not in the current domain");
+            }
         }
         catch (const Exception&)
         {
@@ -264,7 +268,11 @@ EntityId DatabaseEntityQueue::process_datawriter(
         try
         {
             participant_id = database_->get_entity_by_guid(EntityKind::PARTICIPANT, to_string(participant_guid));
-            assert(participant_id.first == info.domain_id);
+            if (participant_id.first != info.domain_id)
+            {
+                throw BadParameter("Participant " + to_string(participant_guid)
+                          +  " found in the database but it is not in the current domain");
+            }
         }
         catch (const Exception&)
         {
@@ -323,7 +331,11 @@ EntityId DatabaseEntityQueue::process_endpoint_discovery(
     try
     {
         participant_id = database_->get_entity_by_guid(EntityKind::PARTICIPANT, to_string(participant_guid));
-        assert(participant_id.first == info.domain_id);
+        if (participant_id.first != info.domain_id)
+        {
+            throw BadParameter("Participant " + to_string(participant_guid)
+                        +  " found in the database but it is not in the current domain");
+        }
     }
     catch (const Exception&)
     {

src/cpp/database/samples.hpp

@@ -122,11 +122,19 @@ struct EntityCountSample : StatisticsSample
     inline EntityCountSample operator -(
             const EntityCountSample& other) const noexcept
     {
-        assert(count >= other.count);
-        EntityCountSample ret(kind);
-        ret.src_ts = src_ts;
-        ret.count = count - other.count;
-        return ret;
+        if (count >= other.count)
+        {
+            EntityCountSample ret(kind);
+            ret.src_ts = src_ts;
+            ret.count = count - other.count;
+            return ret;
+        }
+        else
+        {
+            // This should return an exception but keep this way for now until we verify that the exception is
+            // properly handled by the monitor
+            return EntityCountSample();
+        }
     }
 
     uint64_t count;