Skip to content

Commit 0465569

Browse files
MiguelCompanyMiguelCompany
authored
Prepare RTPSDomainImpl to be extended (#6031)
* Refs #23647. Move rtps domain code into new folder. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Add interface for rtps domain implementation. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Class `RTPSDomainImpl` implements the new interface. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Changed return type of `get_instance()`. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Move `get_instance` to a different file. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Private members are now protected. Signed-off-by: Miguel Company <[email protected]> * Refs #23646. Fix dyn_network system tests. Signed-off-by: Miguel Company <[email protected]> * Refs #23646. Update interfaces moved to Fast DDS Pro. Signed-off-by: Miguel Company <[email protected]> * Refs #23646. Remove dynamic network interfaces tests. Signed-off-by: Miguel Company <[email protected]> * Refs #23646. Improve system test CMakeLists. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Remove duplicated documentation. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Other minor suggestions. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Refactor static methods. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Fix link issues in unit tests. Signed-off-by: Miguel Company <[email protected]> * Refs #23647. Fix UserListener tests. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]>
1 parent e7f71c7 commit 0465569

40 files changed

+681
-502
lines changed

‎include/fastdds/dds/domain/DomainParticipantFactory.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace eprosima {
3939
namespace fastdds {
4040
namespace rtps {
4141

42-
class RTPSDomainImpl;
42+
class IDomainImpl;
4343

4444
namespace detail {
4545
class TopicPayloadPoolRegistry;
@@ -482,7 +482,7 @@ class DomainParticipantFactory
482482

483483
std::shared_ptr<fastdds::rtps::detail::TopicPayloadPoolRegistry> topic_pool_;
484484

485-
std::shared_ptr<fastdds::rtps::RTPSDomainImpl> rtps_domain_;
485+
std::shared_ptr<fastdds::rtps::IDomainImpl> rtps_domain_;
486486

487487
std::shared_ptr<detail::LogResources> log_resources_;
488488

‎src/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ foreach(MODULE_DIR ${${PROJECT_NAME}_module_dirs})
3737
endforeach()
3838

3939
list(APPEND ${PROJECT_NAME}_source_files
40+
rtps/domain/RTPSDomainExtras.cpp
4041
xmlparser/XMLParserExtras.cpp
4142
)
4243

‎src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <rtps/builtin/discovery/participant/PDP.h>
4141
#include <rtps/participant/RTPSParticipantImpl.hpp>
4242
#include <rtps/reader/StatefulReader.hpp>
43-
#include <rtps/RTPSDomainImpl.hpp>
43+
#include <rtps/domain/RTPSDomainImpl.hpp>
4444
#include <rtps/writer/StatefulWriter.hpp>
4545

4646
namespace eprosima {

‎src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
2424
#include <rtps/participant/RTPSParticipantImpl.hpp>
25-
#include <rtps/RTPSDomainImpl.hpp>
25+
#include <rtps/domain/RTPSDomainImpl.hpp>
2626

2727
using eprosima::fastdds::rtps::RTPSReader;
2828
using eprosima::fastdds::rtps::CacheChange_t;

‎src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
2525
#include <rtps/participant/RTPSParticipantImpl.hpp>
26-
#include <rtps/RTPSDomainImpl.hpp>
26+
#include <rtps/domain/RTPSDomainImpl.hpp>
2727
#include <rtps/reader/StatefulReader.hpp>
2828

2929
using eprosima::fastdds::rtps::RTPSReader;

‎src/cpp/fastdds/domain/DomainParticipantFactory.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <fastdds/domain/DomainParticipantImpl.hpp>
3434
#include <fastdds/log/LogResources.hpp>
3535
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
36-
#include <rtps/RTPSDomainImpl.hpp>
36+
#include <rtps/domain/RTPSDomainImpl.hpp>
3737
#include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
3838
#include <utils/shared_memory/SharedMemWatchdog.hpp>
3939
#include <utils/SystemInfo.hpp>

‎src/cpp/fastdds/domain/DomainParticipantImpl.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
#include <fastdds/utils/QosConverters.hpp>
6363
#include <fastdds/utils/TypePropagation.hpp>
6464
#include <rtps/builtin/liveliness/WLP.hpp>
65-
#include <rtps/RTPSDomainImpl.hpp>
65+
#include <rtps/domain/RTPSDomainImpl.hpp>
6666
#include <utils/SystemInfo.hpp>
6767
#include <xmlparser/attributes/PublisherAttributes.hpp>
6868
#include <xmlparser/attributes/ReplierAttributes.hpp>
@@ -128,7 +128,7 @@ DomainParticipantImpl::DomainParticipantImpl(
128128

129129
// Pre calculate participant id and generated guid
130130
participant_id_ = qos_.wire_protocol().participant_id;
131-
if (!eprosima::fastdds::rtps::RTPSDomainImpl::create_participant_guid(participant_id_, guid_))
131+
if (!eprosima::fastdds::rtps::RTPSDomainImpl::get_instance()->create_participant_guid(participant_id_, guid_))
132132
{
133133
EPROSIMA_LOG_ERROR(DOMAIN_PARTICIPANT, "Error generating GUID for participant");
134134
}

‎src/cpp/fastdds/publisher/DataWriterImpl.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include <rtps/participant/RTPSParticipantImpl.hpp>
5252
#include <rtps/resources/ResourceEvent.h>
5353
#include <rtps/resources/TimedEvent.h>
54-
#include <rtps/RTPSDomainImpl.hpp>
54+
#include <rtps/domain/RTPSDomainImpl.hpp>
5555
#include <rtps/writer/BaseWriter.hpp>
5656
#include <rtps/writer/StatefulWriter.hpp>
5757
#include <utils/TimeConversion.hpp>
@@ -377,7 +377,7 @@ ReturnCode_t DataWriterImpl::enable()
377377

378378
create_history(pool, change_pool);
379379

380-
RTPSWriter* writer = RTPSDomainImpl::create_rtps_writer(
380+
RTPSWriter* writer = RTPSDomain::createRTPSWriter(
381381
publisher_->rtps_participant(),
382382
guid_.entityId,
383383
w_att,
@@ -415,7 +415,7 @@ ReturnCode_t DataWriterImpl::enable()
415415
}
416416

417417
create_history(pool, change_pool);
418-
writer = RTPSDomainImpl::create_rtps_writer(
418+
writer = RTPSDomain::createRTPSWriter(
419419
publisher_->rtps_participant(),
420420
guid_.entityId,
421421
w_att,

‎src/cpp/fastdds/subscriber/DataReaderImpl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#include <rtps/participant/RTPSParticipantImpl.hpp>
5454
#include <rtps/resources/TimedEvent.h>
5555
#include <rtps/resources/ResourceEvent.h>
56-
#include <rtps/RTPSDomainImpl.hpp>
56+
#include <rtps/domain/RTPSDomainImpl.hpp>
5757
#include <utils/TimeConversion.hpp>
5858
#include <utils/BuiltinTopicKeyConversions.hpp>
5959
#ifdef FASTDDS_STATISTICS

‎src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "common.hpp"
2828
#include "DynamicDataImpl.hpp"
2929
#include "DynamicTypeImpl.hpp"
30-
#include <rtps/RTPSDomainImpl.hpp>
30+
#include <rtps/domain/RTPSDomainImpl.hpp>
3131

3232
namespace eprosima {
3333
namespace fastdds {

0 commit comments

Comments
 (0)