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

Jump to bottom

[20765] Make RTPS reader implementations private #4674

Merged
merged 6 commits into from
May 27, 2024
Merged

[20765] Make RTPS reader implementations private #4674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3c6f58
Refs #20765: Make StatefulPersistentReader private
elianalf Apr 9, 2024
1aebe38
Refs #20765: Make StatelessPersistentReader private
elianalf Apr 9, 2024
b578bbe
Refs #20765: Make StatefulReader private
elianalf Apr 9, 2024
fc47457
Refs #20765: Make StatelessReader private
elianalf Apr 9, 2024
f47830e
Refs #20765: Make .h files .hpp
elianalf May 24, 2024
5c03969
Refs #20765: Apply suggestions
elianalf May 27, 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 src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/RTPSWriter.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include <rtps/builtin/BuiltinProtocols.h>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/RTPSDomainImpl.hpp>

namespace eprosima {
Expand Down
1 change: 1 addition & 0 deletions src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/RTPSDomainImpl.hpp>
#include <rtps/reader/StatefulReader.hpp>

using eprosima::fastrtps::rtps::RTPSReader;
using eprosima::fastrtps::rtps::CacheChange_t;
Expand Down
4 changes: 1 addition & 3 deletions src/cpp/fastdds/domain/DomainParticipantImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@
#include <fastdds/dds/topic/TypeSupport.hpp>
#include <fastdds/rtps/common/Guid.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>

#include "fastdds/topic/DDSSQLFilter/DDSFilterFactory.hpp"
#include <fastdds/topic/TopicProxyFactory.hpp>

#include <rtps/reader/StatefulReader.hpp>

namespace eprosima {
namespace fastrtps {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <fastdds/rtps/attributes/ReaderAttributes.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <rtps/reader/StatefulReader.hpp>

using namespace ::eprosima::fastrtps::rtps;

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include <rtps/builtin/BuiltinProtocols.h>
Expand All @@ -42,6 +41,7 @@
#include <rtps/builtin/discovery/participant/PDP.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/reader/StatefulReader.hpp>
#ifdef FASTDDS_STATISTICS
#include <statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp>
#endif //FASTDDS_STATISTICS
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
#include <fastdds/rtps/common/InstanceHandle.h>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
#include <rtps/builtin/discovery/endpoint/EDPSimple.h>
#include <rtps/builtin/discovery/participant/PDPSimple.h>
#include <rtps/network/NetworkFactory.h>
#include <rtps/reader/StatefulReader.hpp>

using ParameterList = eprosima::fastdds::dds::ParameterList;

Expand Down
3 changes: 1 addition & 2 deletions src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@
#include <fastdds/rtps/common/EntityId_t.hpp>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include <rtps/history/ITopicPayloadPool.h>
#include <rtps/history/PoolConfig.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>

#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>

#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
#include <memory>

#include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include <rtps/builtin/BuiltinReader.hpp>
#include <rtps/builtin/BuiltinWriter.hpp>
#include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
#include <rtps/history/ITopicPayloadPool.h>
#include <rtps/reader/StatefulReader.hpp>

namespace eprosima {
namespace fastdds {
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@

#include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
#include <fastdds/rtps/common/EntityId_t.hpp>
#include <fastdds/rtps/reader/StatelessReader.h>

#include <rtps/builtin/BuiltinReader.hpp>
#include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp>
#include <rtps/reader/StatelessReader.hpp>

namespace eprosima {
namespace fastdds {
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/rtps/builtin/discovery/participant/PDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/reader/StatelessReader.h>
#include <fastdds/rtps/writer/StatelessWriter.h>

#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
Expand All @@ -50,6 +48,8 @@
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/resources/TimedEvent.h>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/reader/StatelessReader.hpp>
#include <utils/shared_mutex.hpp>
#include <utils/TimeConversion.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/ReaderProxy.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

Expand All @@ -46,6 +45,7 @@
#include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
#include <rtps/builtin/liveliness/WLP.h>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <utils/shared_mutex.hpp>
#include <utils/SystemInfo.hpp>
#include <utils/TimeConversion.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/utils/TimedMutex.hpp>

Expand All @@ -47,6 +46,7 @@
#include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
#include <rtps/builtin/liveliness/WLP.h>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <utils/TimeConversion.hpp>

namespace eprosima {
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/reader/StatelessReader.h>
#include <fastdds/rtps/writer/StatelessWriter.h>

#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
Expand All @@ -44,6 +42,8 @@
#include <rtps/builtin/liveliness/WLP.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/reader/StatelessReader.hpp>
#include <rtps/resources/TimedEvent.h>

namespace eprosima {
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
#include <memory>

#include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
#include <fastdds/rtps/reader/StatelessReader.h>
#include <fastdds/rtps/writer/StatelessWriter.h>

#include <rtps/builtin/BuiltinReader.hpp>
#include <rtps/builtin/BuiltinWriter.hpp>
#include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
#include <rtps/history/ITopicPayloadPool.h>
#include <rtps/reader/StatelessReader.hpp>

namespace eprosima {
namespace fastdds {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
#include <memory>

#include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include <rtps/builtin/BuiltinReader.hpp>
#include <rtps/builtin/BuiltinWriter.hpp>
#include <rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp>
#include <rtps/history/ITopicPayloadPool.h>
#include <rtps/reader/StatefulReader.hpp>

namespace eprosima {
namespace fastdds {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/liveliness/WLP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>

#include <fastdds/rtps/writer/StatefulWriter.h>
Expand All @@ -38,6 +37,7 @@
#include <rtps/builtin/liveliness/WLPListener.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/resources/TimedEvent.h>
#include <rtps/writer/LivelinessManager.hpp>
#include <utils/TimeConversion.hpp>
Expand Down
8 changes: 4 additions & 4 deletions src/cpp/rtps/participant/RTPSParticipantImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/reader/StatefulPersistentReader.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/reader/StatelessPersistentReader.h>
#include <fastdds/rtps/reader/StatelessReader.h>
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
Expand All @@ -64,6 +60,10 @@
#include <rtps/network/utils/netmask_filter.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/persistence/PersistenceService.h>
#include <rtps/reader/StatefulPersistentReader.hpp>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/reader/StatelessPersistentReader.hpp>
#include <rtps/reader/StatelessReader.hpp>
#include <statistics/rtps/GuidUtils.hpp>
#include <utils/Semaphore.hpp>
#include <utils/string_utilities.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/reader/StatefulPersistentReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

#include <fastdds/rtps/reader/StatefulPersistentReader.h>
#include <rtps/reader/StatefulPersistentReader.hpp>

#include <fastdds/rtps/history/ReaderHistory.h>

Expand Down
10 changes: 5 additions & 5 deletions ...ds/rtps/reader/StatefulPersistentReader.h → .../rtps/reader/StatefulPersistentReader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
// limitations under the License.

/**
* @file StatefulPersistentReader.h
* @file StatefulPersistentReader.hpp
*/


#ifndef _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_
#define _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_
#ifndef RTPS_READER__STATEFULPERSISTENTREADER_HPP
#define RTPS_READER__STATEFULPERSISTENTREADER_HPP
#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

#include <fastdds/rtps/reader/StatefulReader.h>
#include <rtps/reader/StatefulReader.hpp>

namespace eprosima {
namespace fastrtps {
Expand Down Expand Up @@ -92,4 +92,4 @@ class StatefulPersistentReader : public StatefulReader
} // namespace eprosima

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#endif /* _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_ */
#endif /* RTPS_READER__STATEFULPERSISTENTREADER_HPP */
3 changes: 2 additions & 1 deletion src/cpp/rtps/reader/StatefulReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
*
*/

#include <rtps/reader/StatefulReader.hpp>

#include <cassert>
#include <mutex>
#include <thread>
Expand All @@ -25,7 +27,6 @@
#include <fastdds/rtps/common/VendorId_t.hpp>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/reader/ReaderListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>

#include <rtps/builtin/BuiltinProtocols.h>
#include <rtps/builtin/liveliness/WLP.h>
Expand Down
8 changes: 4 additions & 4 deletions include/fastdds/rtps/reader/StatefulReader.h → src/cpp/rtps/reader/StatefulReader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

/**
* @file StatefulReader.h
* @file StatefulReader.hpp
*/

#ifndef _FASTDDS_RTPS_READER_STATEFULREADER_H_
#define _FASTDDS_RTPS_READER_STATEFULREADER_H_
#ifndef RTPS_READER__STATEFULREADER_HPP
#define RTPS_READER__STATEFULREADER_HPP

#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

Expand Down Expand Up @@ -380,4 +380,4 @@ class StatefulReader : public RTPSReader

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

#endif // _FASTDDS_RTPS_READER_STATEFULREADER_H_
#endif // RTPS_READER__STATEFULREADER_HPP
2 changes: 1 addition & 1 deletion src/cpp/rtps/reader/StatelessPersistentReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

#include <fastdds/rtps/reader/StatelessPersistentReader.h>
#include <rtps/reader/StatelessPersistentReader.hpp>

#include <fastdds/rtps/history/ReaderHistory.h>

Expand Down
10 changes: 5 additions & 5 deletions ...s/rtps/reader/StatelessPersistentReader.h → ...rtps/reader/StatelessPersistentReader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
// limitations under the License.

/**
* @file StatelessPersistentReader.h
* @file StatelessPersistentReader.hpp
*/


#ifndef _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_
#define _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_
#ifndef RTPS_READER__STATELESSPERSISTENTREADER_HPP
#define RTPS_READER__STATELESSPERSISTENTREADER_HPP
#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

#include <fastdds/rtps/reader/StatelessReader.h>
#include <rtps/reader/StatelessReader.hpp>

namespace eprosima {
namespace fastrtps {
Expand Down Expand Up @@ -92,4 +92,4 @@ class StatelessPersistentReader : public StatelessReader
} // namespace eprosima

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#endif /* _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_ */
#endif /* RTPS_READER__STATELESSPERSISTENTREADER_HPP */
2 changes: 1 addition & 1 deletion src/cpp/rtps/reader/StatelessReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
#include <fastdds/rtps/common/VendorId_t.hpp>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/reader/ReaderListener.h>
#include <fastdds/rtps/reader/StatelessReader.h>

#include <rtps/builtin/BuiltinProtocols.h>
#include <rtps/builtin/liveliness/WLP.h>
#include <rtps/DataSharing/DataSharingListener.hpp>
#include <rtps/DataSharing/ReaderPool.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatelessReader.hpp>
#include <rtps/writer/LivelinessManager.hpp>

#include "rtps/RTPSDomainImpl.hpp"
Expand Down
8 changes: 4 additions & 4 deletions ...ude/fastdds/rtps/reader/StatelessReader.h → src/cpp/rtps/reader/StatelessReader.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 StatelessReader.h
* @file StatelessReader.hpp
*/


MiguelCompany marked this conversation as resolved.
Show resolved Hide resolved
#ifndef _FASTDDS_RTPS_READER_STATELESSREADER_H_
#define _FASTDDS_RTPS_READER_STATELESSREADER_H_
#ifndef RTPS_READER__STATELESSREADER_HPP
#define RTPS_READER__STATELESSREADER_HPP

#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

Expand Down Expand Up @@ -302,4 +302,4 @@ class StatelessReader : public RTPSReader

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

#endif /* _FASTDDS_RTPS_READER_STATELESSREADER_H_ */
#endif /* RTPS_READER__STATELESSREADER_HPP */
Loading
Loading