Skip to content

Commit

Permalink
Make ResourceEvent private (#4705)
Browse files Browse the repository at this point in the history 
Signed-off-by: elianalf <[email protected]>
  • Loading branch information
@elianalf
elianalf authored May 28, 2024
1 parent 2e6b169 commit 0d61aef
Show file tree
Hide file tree
Showing 21 changed files with 28 additions and 38 deletions.
2 changes: 1 addition & 1 deletion src/cpp/fastdds/publisher/DataWriterImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <fastdds/publisher/PublisherImpl.hpp>
#include <fastdds/rtps/attributes/TopicAttributes.h>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/rtps/writer/RTPSWriter.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
Expand All @@ -47,6 +46,7 @@
#include <rtps/history/CacheChangePool.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/ResourceEvent.h>
#include <rtps/RTPSDomainImpl.hpp>
#include <rtps/resources/TimedEvent.h>
#include <utils/TimeConversion.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/fastdds/subscriber/DataReaderImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <fastdds/domain/DomainParticipantImpl.hpp>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/subscriber/DataReaderImpl.hpp>
#include <fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp>
Expand All @@ -50,6 +49,7 @@
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/resources/ResourceEvent.h>
#include <utils/TimeConversion.hpp>
#ifdef FASTDDS_STATISTICS
#include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@

#include <fastdds/rtps/attributes/ServerAttributes.h>
#include <fastdds/rtps/history/History.h>
#include <fastdds/rtps/resources/ResourceEvent.h>

#include <rtps/builtin/discovery/database/DiscoveryDataBase.hpp>
#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.hpp>
#include <rtps/resources/ResourceEvent.h>

namespace eprosima {
namespace fastdds {
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

#include <fastdds/rtps/builtin/data/ParticipantProxyData.h>

#include <fastdds/rtps/resources/ResourceEvent.h>

#include <rtps/participant/RTPSParticipantImpl.h>

#include <fastdds/dds/log/Log.hpp>
Expand All @@ -29,6 +27,7 @@
#include <rtps/builtin/discovery/endpoint/EDPClient.h>
#include <rtps/builtin/discovery/participant/PDPClient.h>
#include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
#include <rtps/resources/ResourceEvent.h>
#include <utils/shared_mutex.hpp>

namespace eprosima {
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@

#include <fastdds/rtps/builtin/data/ParticipantProxyData.h>

#include <fastdds/rtps/resources/ResourceEvent.h>

#include <rtps/participant/RTPSParticipantImpl.h>

#include <fastdds/dds/log/Log.hpp>

#include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
#include <rtps/builtin/discovery/participant/PDPServer.hpp>
#include <rtps/resources/ResourceEvent.h>

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

#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/rtps/writer/WriterListener.h>

Expand All @@ -39,6 +37,7 @@
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/resources/TimedEvent.h>
#include <rtps/resources/ResourceEvent.h>
#include <rtps/writer/LivelinessManager.hpp>
#include <utils/TimeConversion.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/participant/RTPSParticipantImpl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include <fastdds/rtps/common/LocatorList.hpp>
#include <fastdds/rtps/history/IChangePool.h>
#include <fastdds/rtps/history/IPayloadPool.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/transport/SenderResource.h>

#include "../flowcontrol/FlowControllerFactory.hpp"
Expand All @@ -53,6 +52,7 @@
#include <rtps/messages/SendBuffersManager.hpp>
#include <rtps/network/NetworkFactory.h>
#include <rtps/network/ReceiverResource.h>
#include <rtps/resources/ResourceEvent.h>
#include <statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp>
#include <statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp>
#include <statistics/rtps/StatisticsBase.hpp>
Expand Down
19 changes: 6 additions & 13 deletions src/cpp/rtps/reader/RTPSReader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,22 @@
* RTPSReader.cpp
*
*/
#include <fastdds/rtps/reader/RTPSReader.h>

#include <typeinfo>
#include <algorithm>
#include <chrono>

#include <fastdds/dds/log/Log.hpp>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/reader/ReaderListener.h>
#include <foonathan/memory/namespace_alias.hpp>
#include <rtps/resources/ResourceEvent.h>
#include <rtps/history/BasicPayloadPool.hpp>
#include <rtps/history/CacheChangePool.h>

#include <rtps/DataSharing/DataSharingListener.hpp>

#include <rtps/participant/RTPSParticipantImpl.h>

#include <rtps/reader/ReaderHistoryState.hpp>

#include <fastdds/dds/log/Log.hpp>

#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/history/ReaderHistory.h>
#include <fastdds/rtps/reader/ReaderListener.h>
#include <fastdds/rtps/resources/ResourceEvent.h>

#include <foonathan/memory/namespace_alias.hpp>

#include <statistics/rtps/StatisticsBase.hpp>


Expand Down
3 changes: 2 additions & 1 deletion src/cpp/rtps/resources/ResourceEvent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
* @file ResourceEvent.cpp
*/

#include <rtps/resources/ResourceEvent.h>

#include <cassert>

#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/dds/log/Log.hpp>

#include "TimedEventImpl.h"
Expand Down
0 ...de/fastdds/rtps/resources/ResourceEvent.h → src/cpp/rtps/resources/ResourceEvent.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/cpp/rtps/resources/TimedEvent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#include <rtps/resources/TimedEvent.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <rtps/resources/ResourceEvent.h>

#include "TimedEventImpl.h"

Expand Down
4 changes: 2 additions & 2 deletions src/cpp/rtps/writer/StatefulWriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@
#include <rtps/messages/RTPSMessageCreator.hpp>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/writer/ReaderProxy.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/rtps/writer/WriterListener.h>
#include <utils/TimeConversion.hpp>

#include <rtps/builtin/BuiltinProtocols.h>
#include <rtps/builtin/liveliness/WLP.h>
Expand All @@ -47,7 +45,9 @@
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/resources/ResourceEvent.h>
#include <rtps/RTPSDomainImpl.hpp>
#include <utils/TimeConversion.hpp>

#ifdef FASTDDS_STATISTICS
#include <statistics/types/monitorservice_types.hpp>
Expand Down
2 changes: 1 addition & 1 deletion test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
#include <fastdds/rtps/common/Types.h>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/subscriber/SubscriberImpl.hpp>
#include <fastdds/topic/TopicImpl.hpp>
#include <fastdds/topic/TopicProxy.hpp>

#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
#include <rtps/resources/ResourceEvent.h>
#include <xmlparser/XMLProfileManager.h>

namespace eprosima {
Expand Down
5 changes: 3 additions & 2 deletions test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@

#include <fastdds/dds/publisher/qos/WriterQos.hpp>
#include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
#include <fastdds/fastdds_dll.hpp>
#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
#include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
#include <fastdds/rtps/common/Guid.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/fastdds_dll.hpp>

#include <rtps/reader/StatefulReader.hpp>
#include <rtps/resources/ResourceEvent.h>
#include <statistics/rtps/monitor-service/Interfaces.hpp>

namespace eprosima {
Expand Down
2 changes: 1 addition & 1 deletion test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
#include <fastdds/rtps/history/IChangePool.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/writer/RTPSWriter.h>

#include <rtps/network/NetworkFactory.h>
#include <rtps/resources/ResourceEvent.h>
#if HAVE_SECURITY
#include <rtps/security/SecurityManager.h>
#endif // if HAVE_SECURITY
Expand Down
0 ...nt/fastdds/rtps/resources/ResourceEvent.h → ...ourceEvent/rtps/resources/ResourceEvent.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <fastdds/rtps/attributes/ReaderAttributes.h>
#include <fastdds/rtps/common/Guid.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <rtps/resources/ResourceEvent.h>

namespace eprosima {
namespace fastrtps {
Expand Down
2 changes: 1 addition & 1 deletion test/unittest/rtps/reader/WriterProxyStopTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/StatefulReader.hpp>
#include <rtps/reader/WriterProxy.h>
#include <rtps/reader/WriterProxy.cpp>
#include <rtps/resources/ResourceEvent.h>
#include <rtps/resources/TimedEvent.h>

namespace testing {
Expand Down
2 changes: 1 addition & 1 deletion test/unittest/rtps/resources/timedevent/TimedEventTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <gtest/gtest.h>

#include <fastdds/rtps/resources/ResourceEvent.h>
#include <rtps/resources/ResourceEvent.h>

#include "mock/MockEvent.h"

Expand Down
3 changes: 1 addition & 2 deletions test/unittest/rtps/writer/LivelinessManagerTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
#include <gtest/gtest.h>

#include <fastdds/rtps/common/Time_t.h>
#include <fastdds/rtps/resources/ResourceEvent.h>

#include <rtps/resources/ResourceEvent.h>
#include <rtps/writer/LivelinessManager.hpp>

class LivelinessManagerTests : public ::testing::Test
Expand Down
2 changes: 1 addition & 1 deletion test/unittest/statistics/rtps/MonitorServiceTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <thread>

#include <fastdds/dds/log/Log.hpp>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <rtps/resources/ResourceEvent.h>

#include <statistics/rtps/monitor-service/Interfaces.hpp>
#include <statistics/rtps/monitor-service/MonitorService.hpp>
Expand Down

0 comments on commit 0d61aef

Please sign in to comment.