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

[21052] Make ChangeForReader, ReaderLocator, ReaderProxy private #4895

Closed
wants to merge 7 commits into from
Closed

[21052] Make ChangeForReader, ReaderLocator, ReaderProxy private #4895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1cfa0d1
Refs #21052: Move ReaderLocator, ChangeForReader and ReaderProxy to p…
Mario-DL Jun 5, 2024
c957bbf
Refs #21052: Update source files headers
Mario-DL Jun 5, 2024
f9a1afd
Refs #21052: Update mock path and unittests accordingly
Mario-DL Jun 5, 2024
fd40991
Refs #21052: Update versions.md
Mario-DL Jun 5, 2024
3a2baa7
Refs #21052: Rev suggestion: Correct header guards & make .hpp
Mario-DL Jun 7, 2024
83587ad
Refs #21052: Rev suggestion: change source files references
Mario-DL Jun 7, 2024
e9528d1
Refs #21052: Apply second review changes
Mario-DL Jun 7, 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/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@

#include <fastdds/rtps/common/CacheChange.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/writer/ReaderProxy.h>

#include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
#include <rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp>
#include <rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp>
#include <rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp>
#include <rtps/writer/ReaderProxy.hpp>
#include <utils/DBQueue.hpp>

namespace eprosima {
Expand Down
4 changes: 2 additions & 2 deletions 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,9 +32,8 @@
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/writer/ReaderProxy.h>

#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>

#include <rtps/builtin/BuiltinProtocols.h>
#include <rtps/builtin/discovery/endpoint/EDPClient.h>
#include <rtps/builtin/discovery/participant/DirectMessageSender.hpp>
Expand All @@ -45,6 +44,7 @@
#include <rtps/builtin/liveliness/WLP.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/writer/ReaderProxy.hpp>
#include <rtps/writer/StatefulWriter.hpp>
#include <utils/shared_mutex.hpp>
#include <utils/SystemInfo.hpp>
Expand Down
12 changes: 4 additions & 8 deletions ...ude/fastdds/rtps/writer/ChangeForReader.h → src/cpp/rtps/writer/ChangeForReader.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 ChangeForReader.h
* @file ChangeForReader.hpp
*/

#ifndef _FASTDDS_RTPS_CHANGEFORREADER_H_
#define _FASTDDS_RTPS_CHANGEFORREADER_H_
#ifndef RTPS_WRITER__CHANGEFORREADER_HPP
#define RTPS_WRITER__CHANGEFORREADER_HPP

#include <fastdds/rtps/common/CacheChange.h>
#include <fastdds/rtps/common/FragmentNumber.h>
Expand All @@ -29,8 +29,6 @@ namespace eprosima {
namespace fastrtps {
namespace rtps {

#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

/**
* Enum ChangeForReaderStatus_t, possible states for a CacheChange_t in a ReaderProxy.
* @ingroup COMMON_MODULE
Expand Down Expand Up @@ -207,10 +205,8 @@ struct ChangeForReaderCmp

};

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

} // namespace rtps
} // namespace fastrtps
} // namespace eprosima

#endif /* _FASTDDS_RTPS_CHANGEFORREADER_H_ */
#endif // RTPS_WRITER__CHANGEFORREADER_HPP
2 changes: 1 addition & 1 deletion src/cpp/rtps/writer/ReaderLocator.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/writer/ReaderLocator.h>
#include <rtps/writer/ReaderLocator.hpp>

#include <fastdds/rtps/common/CacheChange.h>
#include <fastdds/rtps/common/LocatorListComparisons.hpp>
Expand Down
11 changes: 4 additions & 7 deletions include/fastdds/rtps/writer/ReaderLocator.h → src/cpp/rtps/writer/ReaderLocator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@
// limitations under the License.

/**
* @file ReaderLocator.h
* @file ReaderLocator.hpp
*/
#ifndef _FASTDDS_RTPS_READERLOCATOR_H_
#define _FASTDDS_RTPS_READERLOCATOR_H_

#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#ifndef RTPS_WRITER__READERLOCATOR_HPP
#define RTPS_WRITER__READERLOCATOR_HPP

#include <vector>
#include <fastdds/rtps/common/Locator.h>
Expand Down Expand Up @@ -270,5 +268,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
} /* namespace fastrtps */
} /* namespace eprosima */

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#endif /* _FASTDDS_RTPS_READERLOCATOR_H_ */
#endif // RTPS_WRITER__READERLOCATOR_HPP
4 changes: 2 additions & 2 deletions src/cpp/rtps/writer/ReaderProxy.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/writer/ReaderProxy.h>
#include <rtps/writer/ReaderProxy.hpp>

#include <mutex>
#include <cassert>
Expand All @@ -29,7 +29,7 @@

#include <rtps/DataSharing/DataSharingNotifier.hpp>
#include <rtps/history/HistoryAttributesExtension.hpp>
#include "rtps/messages/RTPSGapBuilder.hpp"
#include <rtps/messages/RTPSGapBuilder.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/writer/StatefulWriter.hpp>
Expand Down
34 changes: 14 additions & 20 deletions include/fastdds/rtps/writer/ReaderProxy.h → src/cpp/rtps/writer/ReaderProxy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,28 @@
// limitations under the License.

/**
* @file ReaderProxy.h
* @file ReaderProxy.hpp
*/
#ifndef _FASTDDS_RTPS_WRITER_READERPROXY_H_
#define _FASTDDS_RTPS_WRITER_READERPROXY_H_
#ifndef RTPS_WRITER__READERPROXY_HPP
#define RTPS_WRITER__READERPROXY_HPP

#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#include <algorithm>
#include <atomic>
#include <mutex>
#include <set>

#include <fastdds/rtps/attributes/WriterAttributes.h>
#include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>

#include <fastdds/rtps/attributes/WriterAttributes.h>
#include <fastdds/rtps/builtin/data/ReaderProxyData.h>

#include <fastdds/rtps/common/Types.h>
#include <fastdds/rtps/common/Locator.h>
#include <fastdds/rtps/common/SequenceNumber.h>
#include <fastdds/rtps/common/CacheChange.h>
#include <fastdds/rtps/common/FragmentNumber.h>

#include <fastdds/rtps/writer/ChangeForReader.h>
#include <fastdds/rtps/writer/ReaderLocator.h>

#include <fastdds/rtps/common/Locator.h>
#include <fastdds/rtps/common/SequenceNumber.h>
#include <fastdds/rtps/common/Types.h>
#include <fastdds/utils/collections/ResourceLimitedVector.hpp>

#include <algorithm>
#include <mutex>
#include <set>
#include <atomic>
#include <rtps/writer/ChangeForReader.hpp>
#include <rtps/writer/ReaderLocator.hpp>

namespace eprosima {
namespace fastrtps {
Expand Down Expand Up @@ -509,5 +504,4 @@ class ReaderProxy
} /* namespace fastrtps */
} /* namespace eprosima */

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#endif /* _FASTDDS_RTPS_WRITER_READERPROXY_H_ */
#endif // RTPS_WRITER__READERPROXY_HPP
4 changes: 2 additions & 2 deletions src/cpp/rtps/writer/StatefulWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <rtps/messages/RTPSMessageCreator.hpp>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/writer/ReaderProxy.h>
#include <fastdds/rtps/writer/WriterListener.h>

#include <rtps/builtin/BuiltinProtocols.h>
Expand All @@ -45,9 +44,10 @@
#include <rtps/messages/RTPSMessageGroup.hpp>
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/resources/ResourceEvent.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/RTPSDomainImpl.hpp>
#include <rtps/writer/ReaderProxy.hpp>
#include <utils/TimeConversion.hpp>

#ifdef FASTDDS_STATISTICS
Expand Down
5 changes: 3 additions & 2 deletions src/cpp/rtps/writer/StatelessWriter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@
#include <fastdds/rtps/history/IChangePool.h>
#include <fastdds/rtps/history/IPayloadPool.h>
#include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
#include <fastdds/rtps/writer/ChangeForReader.h>
#include <fastdds/rtps/writer/ReaderLocator.h>
#include <fastdds/rtps/writer/RTPSWriter.h>
#include <fastdds/utils/collections/ResourceLimitedVector.hpp>

#include <rtps/writer/ChangeForReader.hpp>
#include <rtps/writer/ReaderLocator.hpp>

namespace eprosima {
namespace fastrtps {
namespace rtps {
Expand Down
3 changes: 3 additions & 0 deletions test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
#ifndef RTPSGAPBUILDER_HPP
#define RTPSGAPBUILDER_HPP

#include <fastdds/rtps/common/SequenceNumber.h>
#include <fastdds/rtps/common/Guid.h>

#include <rtps/messages/RTPSMessageGroup.hpp>

namespace eprosima {
Expand Down
12 changes: 4 additions & 8 deletions ...cator/fastdds/rtps/writer/ReaderLocator.h → ...aderLocator/rtps/writer/ReaderLocator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@
// limitations under the License.

/**
* @file ReaderLocator.h
* @file ReaderLocator.hpp
*/



#ifndef _FASTDDS_RTPS_READERLOCATOR_H_
#define _FASTDDS_RTPS_READERLOCATOR_H_
#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#ifndef RTPS_WRITER__READERLOCATOR_HPP
#define RTPS_WRITER__READERLOCATOR_HPP

#include <vector>

Expand Down Expand Up @@ -257,5 +254,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
} /* namespace fastrtps */
} /* namespace eprosima */

#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
#endif /* _FASTDDS_RTPS_READERLOCATOR_H_*/
#endif // RTPS_WRITER__READERLOCATOR_HPP
3 changes: 1 addition & 2 deletions test/unittest/rtps/writer/ReaderProxyTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include <fastdds/rtps/writer/ReaderProxy.h>

#include <rtps/messages/RTPSGapBuilder.hpp>
#include <rtps/writer/ReaderProxy.hpp>
#include <rtps/writer/StatefulWriter.hpp>

//using namespace eprosima::fastrtps::rtps;
Expand Down
3 changes: 3 additions & 0 deletions versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ Forthcoming
* TypeLookupService
* DBQueue
* UnitsParser
* ReaderLocator
* ReaderProxy
* ChangeForReader
* Added create participant methods that use environment XML profile for participant configuration.
* New TypeObjectRegistry class to register/query TypeObjects/TypeIdentifiers.
* New TypeObjectUtils class providing API to build and register TypeObjects/TypeIdentifiers.
Expand Down
Loading