Applied suggestions

Signed-off-by: Eugenio Collado <[email protected]>

Author: EugenioCollado

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

@@ -550,23 +550,19 @@ bool TypeLookupManager::create_endpoints()
 {
     bool ret = true;
 
-    const RTPSParticipantAttributes& pattr = participant_->get_attributes();
-
     // Built-in history attributes.
     HistoryAttributes hatt;
     hatt.initialReservedCaches = 20;
     hatt.maximumReservedCaches = 1000;
     hatt.payloadMaxSize = TypeLookupManager::typelookup_data_max_size;
 
-    WriterAttributes watt = PDP::static_create_builtin_writer_attributes(participant_);
-    rtps::set_builtin_endpoint_locators(watt.endpoint, pattr, nullptr, builtin_protocols_->m_att, builtin_protocols_);
+    WriterAttributes watt = participant_->pdp()->create_builtin_writer_attributes();
     watt.endpoint.remoteLocatorList = builtin_protocols_->m_initialPeersList;
     watt.endpoint.topicKind = fastdds::rtps::NO_KEY;
     watt.endpoint.durabilityKind = fastdds::rtps::VOLATILE;
     watt.mode = fastdds::rtps::ASYNCHRONOUS_WRITER;
 
-    ReaderAttributes ratt = PDP::static_create_builtin_reader_attributes(participant_);
-    rtps::set_builtin_endpoint_locators(ratt.endpoint, pattr, nullptr, builtin_protocols_->m_att, builtin_protocols_);
+    ReaderAttributes ratt = participant_->pdp()->create_builtin_reader_attributes();
     ratt.endpoint.remoteLocatorList = builtin_protocols_->m_initialPeersList;
     ratt.expects_inline_qos = true;
     ratt.endpoint.topicKind = fastdds::rtps::NO_KEY;

src/cpp/rtps/builtin/discovery/participant/PDP.cpp

@@ -1615,19 +1615,20 @@ static void set_builtin_matched_allocation(
     }
 }
 
-void set_builtin_endpoint_locators(
+static void set_builtin_endpoint_locators(
         EndpointAttributes& endpoint,
-        const RTPSParticipantAttributes& pattr,
-        const ParticipantProxyData* part_data,
-        const BuiltinAttributes& builtin_attr,
-        const BuiltinProtocols* builtin_protocol)
+        const PDP* pdp,
+        const BuiltinProtocols* builtin)
 {
+    const RTPSParticipantAttributes& pattr = pdp->getRTPSParticipant()->get_attributes();
+
+    auto part_data = pdp->getLocalParticipantProxyData();
     if (nullptr == part_data)
     {
         // Local participant data has not yet been created.
         // This means we are creating the PDP endpoints, so we copy the locators from mp_builtin
-        endpoint.multicastLocatorList = builtin_protocol->m_metatrafficMulticastLocatorList;
-        endpoint.unicastLocatorList = builtin_protocol->m_metatrafficUnicastLocatorList;
+        endpoint.multicastLocatorList = builtin->m_metatrafficMulticastLocatorList;
+        endpoint.unicastLocatorList = builtin->m_metatrafficUnicastLocatorList;
     }
     else
     {
@@ -1645,16 +1646,15 @@ void set_builtin_endpoint_locators(
     }
 
     // External locators are always taken from the same place
-    endpoint.external_unicast_locators = builtin_attr.metatraffic_external_unicast_locators;
+    endpoint.external_unicast_locators = pdp->builtin_attributes().metatraffic_external_unicast_locators;
     endpoint.ignore_non_matching_locators = pattr.ignore_non_matching_locators;
 }
 
-ReaderAttributes PDP::static_create_builtin_reader_attributes(
-        const RTPSParticipantImpl* RTPSParticipant)
+ReaderAttributes PDP::create_builtin_reader_attributes()
 {
     ReaderAttributes attributes;
 
-    const RTPSParticipantAttributes& pattr = RTPSParticipant->get_attributes();
+    const RTPSParticipantAttributes& pattr = getRTPSParticipant()->get_attributes();
     set_builtin_matched_allocation(attributes.matched_writers_allocation, pattr);
 
     // Builtin endpoints are always reliable, transient local, keyed topics
@@ -1669,25 +1669,16 @@ ReaderAttributes PDP::static_create_builtin_reader_attributes(
 
     attributes.times.heartbeat_response_delay = pdp_heartbeat_response_delay;
 
-    return attributes;
-}
-
-ReaderAttributes PDP::create_builtin_reader_attributes()
-{
-    ReaderAttributes attributes = static_create_builtin_reader_attributes(getRTPSParticipant());
-
-    set_builtin_endpoint_locators(attributes.endpoint, getRTPSParticipant()->get_attributes(),
-            this->getLocalParticipantProxyData(), this->builtin_attributes(), mp_builtin);
+    set_builtin_endpoint_locators(attributes.endpoint, this, mp_builtin);
 
     return attributes;
 }
 
-WriterAttributes PDP::static_create_builtin_writer_attributes(
-        const RTPSParticipantImpl* RTPSParticipant)
+WriterAttributes PDP::create_builtin_writer_attributes()
 {
     WriterAttributes attributes;
 
-    const RTPSParticipantAttributes& pattr = RTPSParticipant->get_attributes();
+    const RTPSParticipantAttributes& pattr = getRTPSParticipant()->get_attributes();
     set_builtin_matched_allocation(attributes.matched_readers_allocation, pattr);
 
     // Builtin endpoints are always reliable, transient local, keyed topics
@@ -1709,15 +1700,7 @@ WriterAttributes PDP::static_create_builtin_writer_attributes(
     attributes.times.nack_response_delay = pdp_nack_response_delay;
     attributes.times.nack_supression_duration = pdp_nack_supression_duration;
 
-    return attributes;
-}
-
-WriterAttributes PDP::create_builtin_writer_attributes()
-{
-    WriterAttributes attributes = static_create_builtin_writer_attributes(getRTPSParticipant());
-
-    set_builtin_endpoint_locators(attributes.endpoint, getRTPSParticipant()->get_attributes(),
-            this->getLocalParticipantProxyData(), this->builtin_attributes(), mp_builtin);
+    set_builtin_endpoint_locators(attributes.endpoint, this, mp_builtin);
 
     return attributes;
 }

src/cpp/rtps/builtin/discovery/participant/PDP.h

@@ -445,22 +445,6 @@ class PDP : public fastdds::statistics::rtps::IProxyQueryable
 
     WriterAttributes create_builtin_writer_attributes();
 
-    /**
-     * Create the attributes common to any builtin reader
-     * It is a static method to allow TypeLookupManager to create builtin readers
-     * @return ReaderAttributes
-     */
-    static ReaderAttributes static_create_builtin_reader_attributes(
-            const RTPSParticipantImpl* RTPSParticipant);
-
-    /**
-     * Create the attributes common to any builtin writer
-     * It is a static method to allow TypeLookupManager to create builtin writers
-     * @return WriterAttributes
-     */
-    static WriterAttributes static_create_builtin_writer_attributes(
-            const RTPSParticipantImpl* RTPSParticipant);
-
 #if HAVE_SECURITY
     void add_builtin_security_attributes(
             ReaderAttributes& ratt,
@@ -695,14 +679,6 @@ class PDP : public fastdds::statistics::rtps::IProxyQueryable
 
 };
 
-void set_builtin_endpoint_locators(
-        EndpointAttributes& endpoint,
-        const RTPSParticipantAttributes& pattr,
-        const ParticipantProxyData* part_data,
-        const BuiltinAttributes& builtin_attr,
-        const BuiltinProtocols* builtin_protocol);
-
-
 // configuration values for PDP reliable entities.
 extern const dds::Duration_t pdp_heartbeat_period;
 extern const dds::Duration_t pdp_nack_response_delay;

src/cpp/rtps/builtin/liveliness/WLP.cpp

@@ -248,8 +248,7 @@ bool WLP::createEndpoints()
     mp_builtinWriterHistory = new WriterHistory(hatt, payload_pool_);
 
     // Built-in writer
-    WriterAttributes watt = PDP::static_create_builtin_writer_attributes(mp_participant);
-    rtps::set_builtin_endpoint_locators(watt.endpoint, pattr, nullptr, mp_builtinProtocols->m_att, mp_builtinProtocols);
+    WriterAttributes watt = mp_participant->pdp()->create_builtin_writer_attributes();
     watt.endpoint.remoteLocatorList = mp_builtinProtocols->m_initialPeersList;
 
     RTPSWriter* wout;
@@ -286,8 +285,7 @@ bool WLP::createEndpoints()
 
     // Built-in reader
 
-    ReaderAttributes ratt = PDP::static_create_builtin_reader_attributes(mp_participant);
-    rtps::set_builtin_endpoint_locators(ratt.endpoint, pattr, nullptr, mp_builtinProtocols->m_att, mp_builtinProtocols);
+    ReaderAttributes ratt = mp_participant->pdp()->create_builtin_reader_attributes();
     ratt.endpoint.remoteLocatorList = mp_builtinProtocols->m_initialPeersList;
     ratt.expects_inline_qos = true;
 
@@ -333,8 +331,7 @@ bool WLP::createSecureEndpoints()
     secure_payload_pool_->reserve_history(writer_pool_cfg, false);
     mp_builtinWriterSecureHistory = new WriterHistory(hatt, secure_payload_pool_);
 
-    WriterAttributes watt = PDP::static_create_builtin_writer_attributes(mp_participant);
-    rtps::set_builtin_endpoint_locators(watt.endpoint, pattr, nullptr, mp_builtinProtocols->m_att, mp_builtinProtocols);
+    WriterAttributes watt = mp_participant->pdp()->create_builtin_writer_attributes();
     //	Wparam.topic.topicName = "DCPSParticipantMessageSecure";
     //	Wparam.topic.topicDataType = "RTPSParticipantMessageData";
 
@@ -378,8 +375,7 @@ bool WLP::createSecureEndpoints()
     secure_payload_pool_->reserve_history(reader_pool_cfg, true);
 
     mp_builtinReaderSecureHistory = new ReaderHistory(hatt);
-    ReaderAttributes ratt = PDP::static_create_builtin_reader_attributes(mp_participant);
-    rtps::set_builtin_endpoint_locators(ratt.endpoint, pattr, nullptr, mp_builtinProtocols->m_att, mp_builtinProtocols);
+    ReaderAttributes ratt = mp_participant->pdp()->create_builtin_reader_attributes();
     ratt.expects_inline_qos = true;
     //Rparam.topic.topicName = "DCPSParticipantMessageSecure";
     //Rparam.topic.topicDataType = "RTPSParticipantMessageData";

test/blackbox/api/dds-pim/PubSubWriter.hpp

@@ -999,7 +999,7 @@ class PubSubWriter
             uint32_t periodInMs)
     {
         auto new_flow_controller = std::make_shared<eprosima::fastdds::rtps::FlowControllerDescriptor>();
-        new_flow_controller->name = "MyFlowController";
+        new_flow_controller->name = "MyBuiltinFlowController";
         new_flow_controller->scheduler = scheduler_policy;
         new_flow_controller->max_bytes_per_period = bytesPerPeriod;
         new_flow_controller->period_ms = static_cast<uint64_t>(periodInMs);