Migrate ResourceManagement to rtps attributes API (#4962)

* Refs #21130: Migrate ResourceManagement to rtps attributes API and update guards and .hpp format Signed-off-by: JesusPoderoso <[email protected]> * Refs #21130: Update versions.md Signed-off-by: JesusPoderoso <[email protected]> --------- Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Jun 18, 2024 · 5cc3dc3 · 5cc3dc3
1 parent 332db84
commit 5cc3dc3
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 21 deletions.
diff --git a/include/fastdds/dds/core/policy/QosPolicies.hpp b/include/fastdds/dds/core/policy/QosPolicies.hpp
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/flowcontrol/FlowControllerConsts.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>

diff --git a/include/fastdds/rtps/attributes/HistoryAttributes.h b/include/fastdds/rtps/attributes/HistoryAttributes.h
@@ -20,7 +20,7 @@
 #ifndef _FASTDDS_HISTORYATTRIBUTES_H_
 #define _FASTDDS_HISTORYATTRIBUTES_H_
 
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 #include <cstdint>

diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 #include <fastdds/rtps/transport/TransportInterface.h>
 #include <fastdds/fastdds_dll.hpp>

diff --git a/...stdds/rtps/resources/ResourceManagement.h → ...ds/rtps/attributes/ResourceManagement.hpp b/...stdds/rtps/resources/ResourceManagement.h → ...ds/rtps/attributes/ResourceManagement.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file ResourceManagement.h
+ * @file ResourceManagement.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_
-#define _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__RESOURCEMANAGEMENT_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__RESOURCEMANAGEMENT_HPP
 
 
 namespace eprosima {
@@ -38,8 +38,8 @@ typedef enum MemoryManagementPolicy
 }MemoryManagementPolicy_t;
 
 
-} // end namespaces
+} // namespace rtps
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__RESOURCEMANAGEMENT_HPP
diff --git a/src/cpp/fastdds/publisher/DataWriterHistory.hpp b/src/cpp/fastdds/publisher/DataWriterHistory.hpp
@@ -27,7 +27,7 @@
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>
 

diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
@@ -40,7 +40,7 @@
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SequenceNumber.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <fastdds/subscriber/DataReaderImpl/StateFilter.hpp>
 

diff --git a/src/cpp/rtps/DataSharing/ReaderPool.hpp b/src/cpp/rtps/DataSharing/ReaderPool.hpp
@@ -20,7 +20,7 @@
 #define RTPS_DATASHARING_READERPOOL_HPP
 
 #include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 

diff --git a/src/cpp/rtps/DataSharing/WriterPool.hpp b/src/cpp/rtps/DataSharing/WriterPool.hpp
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 #include <utils/collections/FixedSizeQueue.hpp>

diff --git a/src/cpp/rtps/history/CacheChangePool.h b/src/cpp/rtps/history/CacheChangePool.h
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <rtps/history/PoolConfig.h>
 

diff --git a/src/cpp/rtps/history/PoolConfig.h b/src/cpp/rtps/history/PoolConfig.h
@@ -20,7 +20,7 @@
 #define RTPS_HISTORY_POOLCONFIG_H_
 
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/rtps/history/TopicPayloadPool.hpp b/src/cpp/rtps/history/TopicPayloadPool.hpp
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/history/PoolConfig.h>
 #include <rtps/history/ITopicPayloadPool.h>

diff --git a/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp b/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp
@@ -19,7 +19,7 @@
 #include <fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp
@@ -19,7 +19,7 @@
 #ifndef _FASTDDS_PUBLISHERATTRIBUTES_H_
 #define _FASTDDS_PUBLISHERATTRIBUTES_H_
 
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>

diff --git a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp b/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
@@ -29,7 +29,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>

diff --git a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 #include <fastdds/rtps/transport/TransportInterface.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>

diff --git a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
@@ -22,7 +22,7 @@
 #include <gmock/gmock.h>
 
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {

diff --git a/versions.md b/versions.md
@@ -58,6 +58,7 @@ Forthcoming
   * New attribute in `SendBuffersAllocationAttributes` to configure allocation of `NetworkBuffer` vector.
   * `SenderResource` and Transport APIs now receive a collection of `NetworkBuffer` on their `send` method.
 * Migrate fastrtps namespace to fastdds
+* Migrate fastrtps `ResourceManagement` API from `rtps/resources` to `rtps/attributes`.
 
 Version 2.14.0
 --------------