Not included mutex for class protection

Signed-off-by: zesk1999 <[email protected]>

Author: zesk1999

src/cpp/fastdds/publisher/DataWriterImpl.cpp

@@ -248,8 +248,6 @@ void DataWriterImpl::create_history(
 
 ReturnCode_t DataWriterImpl::enable()
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     assert(writer_ == nullptr);
 
     auto history_att = DataWriterHistory::to_history_attributes(
@@ -519,8 +517,6 @@ ReturnCode_t DataWriterImpl::loan_sample(
         void*& sample,
         LoanInitializationKind initialization)
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     // Block lowlevel writer
     auto max_blocking_time = steady_clock::now() +
             microseconds(rtps::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));
@@ -822,8 +818,6 @@ InstanceHandle_t DataWriterImpl::do_register_instance(
         const InstanceHandle_t instance_handle,
         WriteParams& wparams)
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     // TODO(MiguelCompany): wparams should be used when propagating the register_instance operation to the DataReader.
     // See redmine issue #14494
     static_cast<void>(wparams);
@@ -871,8 +865,6 @@ ReturnCode_t DataWriterImpl::unregister_instance(
         const InstanceHandle_t& handle,
         bool dispose)
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     // Preconditions
     InstanceHandle_t ih;
     ReturnCode_t returned_value = check_instance_preconditions(instance, handle, ih);
@@ -898,8 +890,6 @@ ReturnCode_t DataWriterImpl::unregister_instance_w_timestamp(
         const fastdds::dds::Time_t& timestamp,
         bool dispose)
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     // Preconditions
     InstanceHandle_t instance_handle;
     ReturnCode_t ret = RETCODE_OK;
@@ -1187,8 +1177,6 @@ InstanceHandle_t DataWriterImpl::get_instance_handle() const
 
 void DataWriterImpl::publisher_qos_updated()
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     if (writer_ != nullptr)
     {
         // NOTIFY THE BUILTIN PROTOCOLS THAT THE WRITER HAS CHANGED
@@ -1221,8 +1209,6 @@ ReturnCode_t DataWriterImpl::set_qos(
         }
     }
 
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     if (enabled && !can_qos_be_updated(qos_, qos_to_set))
     {
         return RETCODE_IMMUTABLE_POLICY;
@@ -1235,6 +1221,7 @@ ReturnCode_t DataWriterImpl::set_qos(
 
     if (enabled)
     {
+        std::unique_lock<RecursiveTimedMutex> lock(writer_->getMutex());
         // Locks after we checked that writer exists
 
         int32_t transport_priority = writer_->get_transport_priority();
@@ -1287,7 +1274,6 @@ ReturnCode_t DataWriterImpl::set_qos(
 
 const DataWriterQos& DataWriterImpl::get_qos() const
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
     return qos_;
 }
 
@@ -1797,8 +1783,6 @@ ReturnCode_t DataWriterImpl::assert_liveliness()
 ReturnCode_t DataWriterImpl::get_publication_builtin_topic_data(
         PublicationBuiltinTopicData& publication_data) const
 {
-    std::unique_lock<RecursiveTimedMutex> il(impl_mtx_);
-
     if (nullptr == writer_)
     {
         return RETCODE_NOT_ENABLED;

src/cpp/fastdds/publisher/DataWriterImpl.hpp

@@ -773,11 +773,6 @@ class DataWriterImpl : protected rtps::IReaderDataFilter
 
 private:
 
-    /**
-    * Protects implementation class
-    */
-    mutable RecursiveTimedMutex impl_mtx_;
-
     /**
     * (Re)configures the deadline timer:
     *  Create once, parked with a huge interval (idle).