Refs #16192. Use mutex instead of atomic.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
eProsima · Jan 9, 2023 · 805820a · 805820a
1 parent 19a9f96
commit 805820a
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/src/cpp/fastdds/subscriber/ReadConditionImpl.hpp b/src/cpp/fastdds/subscriber/ReadConditionImpl.hpp
@@ -17,7 +17,6 @@
  */
 
 #include <algorithm>
-#include <atomic>
 #include <forward_list>
 #include <memory>
 #include <mutex>
@@ -45,7 +44,8 @@ class ReadConditionImpl : public std::enable_shared_from_this<ReadConditionImpl>
 {
     DataReaderImpl& data_reader_;
     const StateFilter state_;
-    std::atomic<StateFilter> value_;
+    StateFilter value_;
+    mutable std::mutex value_mtx_;
     std::recursive_mutex& mutex_;
     std::forward_list<const ReadCondition*> conditions_;
 
@@ -63,7 +63,9 @@ class ReadConditionImpl : public std::enable_shared_from_this<ReadConditionImpl>
     {
         try
         {
-            value_.store(data_reader_.get_last_mask_state());
+            auto value = data_reader_.get_last_mask_state();
+            std::lock_guard<std::mutex> _(value_mtx_);
+            value_ = value;
         }
         catch (std::runtime_error& e)
         {
@@ -109,16 +111,8 @@ class ReadConditionImpl : public std::enable_shared_from_this<ReadConditionImpl>
 
     bool get_trigger_value() const noexcept
     {
-        try
-        {
-            return get_trigger_value(value_);
-        }
-        catch (std::runtime_error& e)
-        {
-            // DataReader not enabled yet
-            EPROSIMA_LOG_WARNING(READCONDITION, e.what());
-            return false;
-        }
+        std::lock_guard<std::mutex> _(value_mtx_);
+        return get_trigger_value(value_);
     }
 
     DataReader* get_datareader() const noexcept
@@ -221,7 +215,8 @@ class ReadConditionImpl : public std::enable_shared_from_this<ReadConditionImpl>
     void set_trigger_value(
             const StateFilter& value) noexcept
     {
-        value_.store(value);
+        std::lock_guard<std::mutex> _(value_mtx_);
+        value_ = value;
     }
 
     /**