Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21130] Migrate ResourceManagement to rtps attributes API #4962

Merged
merged 2 commits into from
Jun 18, 2024
Merged

[21130] Migrate ResourceManagement to rtps attributes API #4962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd9c124
Refs #21130: Migrate ResourceManagement to rtps attributes API and up…
JesusPoderoso Jun 18, 2024
3e08e66
Refs #21130: Update versions.md
JesusPoderoso Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/fastdds/dds/core/policy/QosPolicies.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion include/fastdds/rtps/attributes/HistoryAttributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions ...stdds/rtps/resources/ResourceManagement.h → ...ds/rtps/attributes/ResourceManagement.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
2 changes: 1 addition & 1 deletion src/cpp/fastdds/publisher/DataWriterHistory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/DataSharing/ReaderPool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/DataSharing/WriterPool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/history/CacheChangePool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/history/PoolConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/history/TopicPayloadPool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/xmlparser/attributes/PublisherAttributes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------------
Expand Down