Added RCPPUTILS_TSA_GUARDED_BY macros to previously atomic booleans

Signed-off-by: Javier Santiago <[email protected]> Signed-off-by: Ricardo González Moreno <[email protected]>
ros2 · Jul 21, 2022 · 850eeeb · 850eeeb
1 parent da3ade0
commit 850eeeb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_publisher_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_publisher_info.hpp
@@ -128,15 +128,21 @@ class PubListener : public EventListenerInterface, public eprosima::fastdds::dds
   std::set<eprosima::fastrtps::rtps::GUID_t> subscriptions_
   RCPPUTILS_TSA_GUARDED_BY(discovery_m_);
 
-  bool deadline_changes_;
+  bool deadline_changes_
+  RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
+
   eprosima::fastdds::dds::OfferedDeadlineMissedStatus offered_deadline_missed_status_
   RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
 
-  bool liveliness_changes_;
+  bool liveliness_changes_
+  RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
+
   eprosima::fastdds::dds::LivelinessLostStatus liveliness_lost_status_
   RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
 
-  bool incompatible_qos_changes_;
+  bool incompatible_qos_changes_
+  RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
+
   eprosima::fastdds::dds::OfferedIncompatibleQosStatus incompatible_qos_status_
   RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
 };

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_subscriber_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_subscriber_info.hpp
@@ -169,19 +169,27 @@ class SubListener : public EventListenerInterface, public eprosima::fastdds::dds
 private:
   CustomSubscriberInfo * subscriber_info_ = nullptr;
 
-  bool deadline_changes_;
+  bool deadline_changes_
+  RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
+
   eprosima::fastdds::dds::RequestedDeadlineMissedStatus requested_deadline_missed_status_
   RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
 
-  bool liveliness_changes_;
+  bool liveliness_changes_
+  RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
+
   eprosima::fastdds::dds::LivelinessChangedStatus liveliness_changed_status_
   RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
 
-  bool sample_lost_changes_;
+  bool sample_lost_changes_
+  RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
+
   eprosima::fastdds::dds::SampleLostStatus sample_lost_status_
   RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
 
-  bool incompatible_qos_changes_;
+  bool incompatible_qos_changes_
+  RCPPUTILS_TSA_GUARDED_BY(on_new_event_m_);
+
   eprosima::fastdds::dds::RequestedIncompatibleQosStatus incompatible_qos_status_
   RCPPUTILS_TSA_GUARDED_BY(discovery_m_);