Skip to content

Commit 9bfccc7

Browse files
cferreiragonzcferreiragonz
committed
Fix RTPSParticipantAttributes internal data races (#6370)
* Refs #23923: Take mutex in getter and env file callback Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23923: Only update mutable attributes Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23923: Copy attributes in getter Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23923: Undo copy attributes Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23923: Avoid calling get_attributes in SecurityManager constructor Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23923: Copy attributes Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23923: Protect missing cases Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Create new method to avoid API break Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Doxygen & TODO in next major Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Copy method in RTPSParticipant Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Mock and tests changes Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Revision Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Add missing mutable attribute Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Create const copy Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Uncrustify Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Spelling Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Split const and mutable RTPSParticipantAttributes Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Review - Fix Mutable & Constant attributes Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Review - Apply methods and composition of BuiltinAttributes Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Review - Update Tests Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Review - Add ConstantDiscoverySettings Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Solve using statement visibility Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Uncrustify Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Store constant attributes set at 'setup_' methods Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Init const attributes and update later Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> * Refs #23923: Review - Improve doxygen Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> Co-authored-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 7dd4b4d) # Conflicts: # include/fastdds/dds/publisher/DataWriter.hpp # src/cpp/rtps/participant/RTPSParticipantImpl.cpp
1 parent 447bf8d commit 9bfccc7

43 files changed

Lines changed: 1457 additions & 206 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/fastdds/dds/publisher/DataWriter.hpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,9 +481,13 @@ class DataWriter : public DomainEntity
481481
*
482482
* @param [out] subscription_data subscription data struct
483483
* @param subscription_handle InstanceHandle_t of the subscription
484+
<<<<<<< HEAD
484485
* @return RETCODE_OK
485486
*
486487
* @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED
488+
=======
489+
* @return RETCODE_OK if successful, RETCODE_BAD_PARAMETER otherwise
490+
>>>>>>> 7dd4b4d17 (Fix RTPSParticipantAttributes internal data races (#6370))
487491
*/
488492
FASTDDS_EXPORTED_API ReturnCode_t get_matched_subscription_data(
489493
SubscriptionBuiltinTopicData& subscription_data,
@@ -493,9 +497,13 @@ class DataWriter : public DomainEntity
493497
* @brief Fills the given vector with the InstanceHandle_t of matched DataReaders
494498
*
495499
* @param [out] subscription_handles Vector where the InstanceHandle_t are returned
500+
<<<<<<< HEAD
496501
* @return RETCODE_OK
497502
*
498503
* @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED
504+
=======
505+
* @return RETCODE_OK if successful, RETCODE_ERROR otherwise
506+
>>>>>>> 7dd4b4d17 (Fix RTPSParticipantAttributes internal data races (#6370))
499507
*/
500508
FASTDDS_EXPORTED_API ReturnCode_t get_matched_subscriptions(
501509
std::vector<InstanceHandle_t>& subscription_handles) const;

0 commit comments

Comments
 (0)