Refs #20709: Make private RTPSMessageGroup.h

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · May 14, 2024 · 0a26720 · 0a26720
1 parent 5d1ecac
commit 0a26720
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 98 deletions.
diff --git a/include/fastdds/rtps/reader/StatefulReader.h b/include/fastdds/rtps/reader/StatefulReader.h
@@ -25,7 +25,6 @@
 
 #include <fastdds/rtps/common/CDRMessage_t.h>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 

diff --git a/include/fastdds/rtps/writer/RTPSWriter.h b/include/fastdds/rtps/writer/RTPSWriter.h
@@ -33,7 +33,6 @@
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/Endpoint.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/writer/DeliveryRetCode.hpp>
 #include <fastdds/rtps/writer/LocatorSelectorSender.hpp>
 #include <fastdds/statistics/rtps/monitor_service/connections_fwd.hpp>
@@ -60,6 +59,7 @@ namespace rtps {
 class WriterListener;
 class WriterHistory;
 class DataSharingNotifier;
+class RTPSMessageGroup;
 struct CacheChange_t;
 
 /**
@@ -585,49 +585,6 @@ class RTPSWriter
 
     bool is_pool_initialized() const;
 
-    template<typename Functor>
-    bool send_data_or_fragments(
-            RTPSMessageGroup& group,
-            CacheChange_t* change,
-            bool inline_qos,
-            Functor sent_fun)
-    {
-        bool sent_ok = true;
-
-        uint32_t n_fragments = change->getFragmentCount();
-        if (n_fragments > 0)
-        {
-            for (FragmentNumber_t frag = 1; frag <= n_fragments; frag++)
-            {
-                sent_ok &= group.add_data_frag(*change, frag, inline_qos);
-                if (sent_ok)
-                {
-                    sent_fun(change, frag);
-                }
-                else
-                {
-                    EPROSIMA_LOG_ERROR(RTPS_WRITER,
-                            "Error sending fragment (" << change->sequenceNumber << ", " << frag << ")");
-                    break;
-                }
-            }
-        }
-        else
-        {
-            sent_ok = group.add_data(*change, inline_qos);
-            if (sent_ok)
-            {
-                sent_fun(change, 0);
-            }
-            else
-            {
-                EPROSIMA_LOG_ERROR(RTPS_WRITER, "Error sending change " << change->sequenceNumber);
-            }
-        }
-
-        return sent_ok;
-    }
-
     void add_statistics_sent_submessage(
             CacheChange_t* change,
             size_t num_locators);

diff --git a/include/fastdds/rtps/writer/ReaderLocator.h b/include/fastdds/rtps/writer/ReaderLocator.h
@@ -24,7 +24,7 @@
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
+#include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
 namespace eprosima {

diff --git a/include/fastdds/rtps/writer/StatelessWriter.h b/include/fastdds/rtps/writer/StatelessWriter.h
@@ -38,6 +38,7 @@ namespace eprosima {
 namespace fastrtps {
 namespace rtps {
 
+class RTPSMessageGroup;
 
 /**
  * Class StatelessWriter, specialization of RTPSWriter that manages writers that don't keep state of the matched readers.
@@ -46,7 +47,8 @@ namespace rtps {
 class StatelessWriter : public RTPSWriter
 {
     friend class RTPSParticipantImpl;
-
+    friend class RTPSMessageGroup;
+
 protected:
 
     StatelessWriter(

diff --git a/include/fastrtps/rtps/messages/RTPSMessageGroup.h b/include/fastrtps/rtps/messages/RTPSMessageGroup.h
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.h b/src/cpp/rtps/builtin/discovery/participant/PDPClient.h
@@ -21,12 +21,11 @@
 #define _FASTDDS_RTPS_PDPCLIENT_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
-
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
+#include <rtps/messages/RTPSMessageGroup.h>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
@@ -36,6 +36,7 @@
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp>
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
+#include <rtps/messages/RTPSMessageGroup.h>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
@@ -15,6 +15,7 @@
 #include <fastdds/utils/TimedMutex.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/messages/RTPSMessageGroup.h>
 #include <utils/thread.hpp>
 #include <utils/threading.hpp>
 

diff --git a/src/cpp/rtps/history/WriterHistory.cpp b/src/cpp/rtps/history/WriterHistory.cpp
@@ -18,12 +18,13 @@
 
 #include <fastdds/rtps/history/WriterHistory.h>
 
+#include <mutex>
+
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/common/WriteParams.h>
 #include <fastdds/core/policy//ParameterSerializer.hpp>
-
-#include <mutex>
+#include <rtps/messages/RTPSMessageGroup.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/messages/RTPSGapBuilder.hpp b/src/cpp/rtps/messages/RTPSGapBuilder.hpp
@@ -21,7 +21,7 @@
 #define RTPSGAPBUILDER_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
+#include "RTPSMessageGroup.h"
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.cpp b/src/cpp/rtps/messages/RTPSMessageGroup.cpp
@@ -17,11 +17,12 @@
  *
  */
 
+#include "RTPSMessageGroup.h"
+
 #include <algorithm>
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/messages/RTPSMessageCreator.h>
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 

diff --git a/.../fastdds/rtps/messages/RTPSMessageGroup.h → src/cpp/rtps/messages/RTPSMessageGroup.h b/.../fastdds/rtps/messages/RTPSMessageGroup.h → src/cpp/rtps/messages/RTPSMessageGroup.h
diff --git a/src/cpp/rtps/messages/SendBuffersManager.cpp b/src/cpp/rtps/messages/SendBuffersManager.cpp
@@ -17,8 +17,9 @@
  */
 
 #include "SendBuffersManager.hpp"
+
+#include "RTPSMessageGroup.h"
 #include "../participant/RTPSParticipantImpl.h"
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp
@@ -24,7 +24,6 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 
@@ -33,6 +32,7 @@
 #include <rtps/DataSharing/DataSharingListener.hpp>
 #include <rtps/DataSharing/ReaderPool.hpp>
 #include <rtps/history/HistoryAttributesExtension.hpp>
+#include <rtps/messages/RTPSMessageGroup.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/writer/LivelinessManager.hpp>

diff --git a/src/cpp/rtps/writer/RTPSWriter.cpp b/src/cpp/rtps/writer/RTPSWriter.cpp
@@ -19,25 +19,18 @@
 
 #include <mutex>
 
-#include <rtps/history/BasicPayloadPool.hpp>
-#include <rtps/history/CacheChangePool.h>
-
-#include <rtps/DataSharing/DataSharingNotifier.hpp>
-#include <rtps/DataSharing/WriterPool.hpp>
-
-#include <rtps/participant/RTPSParticipantImpl.h>
-
 #include <fastdds/dds/log/Log.hpp>
-
 #include <fastdds/rtps/writer/RTPSWriter.h>
-
 #include <fastdds/rtps/history/WriterHistory.h>
-
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
-
+#include <rtps/DataSharing/DataSharingNotifier.hpp>
+#include <rtps/DataSharing/WriterPool.hpp>
+#include <rtps/history/BasicPayloadPool.hpp>
+#include <rtps/history/CacheChangePool.h>
+#include <rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageGroup.h>
+#include <rtps/participant/RTPSParticipantImpl.h>
 #include <statistics/rtps/StatisticsBase.hpp>
 #include <statistics/rtps/messages/RTPSStatisticsMessages.hpp>
-
 #include "../flowcontrol/FlowController.hpp"
 
 namespace eprosima {

diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <fastdds/rtps/messages/RTPSMessageCreator.h>
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
@@ -45,6 +44,7 @@
 #include <rtps/history/BasicPayloadPool.hpp>
 #include <rtps/history/CacheChangePool.h>
 #include <rtps/messages/RTPSGapBuilder.hpp>
+#include <rtps/messages/RTPSMessageGroup.h>
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/RTPSDomainImpl.hpp>

diff --git a/src/cpp/rtps/writer/StatelessWriter.cpp b/src/cpp/rtps/writer/StatelessWriter.cpp
@@ -38,6 +38,7 @@
 #include <rtps/history/BasicPayloadPool.hpp>
 #include <rtps/history/CacheChangePool.h>
 #include <rtps/history/HistoryAttributesExtension.hpp>
+#include <rtps/messages/RTPSMessageGroup.h>
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/RTPSDomainImpl.hpp>

diff --git a/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp b/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
@@ -20,7 +20,7 @@
 #ifndef RTPSGAPBUILDER_HPP
 #define RTPSGAPBUILDER_HPP
 
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
+#include <rtps/messages/RTPSMessageGroup.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/.../fastdds/rtps/messages/RTPSMessageGroup.h → ...ageGroup/rtps/messages/RTPSMessageGroup.h b/.../fastdds/rtps/messages/RTPSMessageGroup.h → ...ageGroup/rtps/messages/RTPSMessageGroup.h
diff --git a/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h b/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h
@@ -29,10 +29,10 @@
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/Endpoint.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/writer/DeliveryRetCode.hpp>
 #include <fastdds/rtps/writer/LocatorSelectorSender.hpp>
 #include <fastdds/rtps/writer/WriterListener.h>
+#include <rtps/messages/RTPSMessageGroup.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/test/mock/rtps/ReaderLocator/fastdds/rtps/writer/ReaderLocator.h b/test/mock/rtps/ReaderLocator/fastdds/rtps/writer/ReaderLocator.h
@@ -28,7 +28,6 @@
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 #include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
 
 namespace eprosima {