Skip to content

Commit b2014c7

Browse files
cferreiragonzmergify[bot]
cferreiragonz
authored and
mergify[bot]
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 # include/fastdds/rtps/attributes/RTPSParticipantAttributes.h # include/fastdds/rtps/participant/RTPSParticipant.h # src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp # src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp # src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp # src/cpp/fastdds/domain/DomainParticipantImpl.cpp # src/cpp/rtps/builtin/BuiltinProtocols.cpp # src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp # src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp # src/cpp/rtps/builtin/discovery/participant/PDP.cpp # src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp # src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp # src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp # src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp # src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp # src/cpp/rtps/builtin/discovery/participant/simple/PDPStatelessWriter.cpp # src/cpp/rtps/builtin/liveliness/WLP.cpp # src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp # src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp # src/cpp/rtps/participant/RTPSParticipantImpl.cpp # src/cpp/rtps/participant/RTPSParticipantImpl.h # src/cpp/rtps/reader/BaseReader.cpp # src/cpp/rtps/reader/StatefulReader.cpp # src/cpp/rtps/security/SecurityManager.cpp # test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h # test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h # test/unittest/dds/participant/ParticipantTests.cpp
1 parent d96f0eb commit b2014c7

43 files changed

Lines changed: 4197 additions & 65 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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,13 @@ class DataWriter : public DomainEntity
517517
*
518518
* @param[out] subscription_data subscription data struct
519519
* @param subscription_handle InstanceHandle_t of the subscription
520+
<<<<<<< HEAD
520521
* @return RETCODE_OK
521522
*
522523
* @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED
524+
=======
525+
* @return RETCODE_OK if successful, RETCODE_BAD_PARAMETER otherwise
526+
>>>>>>> 7dd4b4d17 (Fix RTPSParticipantAttributes internal data races (#6370))
523527
*/
524528
RTPS_DllAPI ReturnCode_t get_matched_subscription_data(
525529
builtin::SubscriptionBuiltinTopicData& subscription_data,
@@ -528,10 +532,15 @@ class DataWriter : public DomainEntity
528532
/**
529533
* @brief Fills the given vector with the InstanceHandle_t of matched DataReaders
530534
*
535+
<<<<<<< HEAD
531536
* @param[out] subscription_handles Vector where the InstanceHandle_t are returned
532537
* @return RETCODE_OK
533538
*
534539
* @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED
540+
=======
541+
* @param [out] subscription_handles Vector where the InstanceHandle_t are returned
542+
* @return RETCODE_OK if successful, RETCODE_ERROR otherwise
543+
>>>>>>> 7dd4b4d17 (Fix RTPSParticipantAttributes internal data races (#6370))
535544
*/
536545
RTPS_DllAPI ReturnCode_t get_matched_subscriptions(
537546
std::vector<InstanceHandle_t>& subscription_handles) const;

0 commit comments

Comments
 (0)