Refs #20567: Make shared_mutex private

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Mar 11, 2024 · 75ad22d · 75ad22d
1 parent 0122a12
commit 75ad22d
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 13 deletions.
diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.h b/src/cpp/rtps/builtin/BuiltinProtocols.h
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
 
-#include <fastrtps/utils/shared_mutex.hpp>
+#include <utils/shared_mutex.hpp>
 
 namespace eprosima {
 

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -22,7 +22,6 @@
 #include <mutex>
 #include <chrono>
 
-#include "fastrtps/utils/shared_mutex.hpp"
 #include <fastdds/dds/builtin/typelookup/TypeLookupManager.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
@@ -54,6 +53,7 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/network/ExternalLocatorsProcessor.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <utils/shared_mutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -35,7 +35,6 @@
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastrtps/utils/shared_mutex.hpp>
 #include <fastrtps/utils/TimeConversion.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -47,6 +46,7 @@
 #include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <utils/shared_mutex.hpp>
 #include <utils/SystemInfo.hpp>
 
 using namespace eprosima::fastrtps;

diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp
@@ -24,12 +24,12 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastrtps/utils/shared_mutex.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
-#include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
-#include <rtps/builtin/discovery/participant/PDPClient.h>
 #include <rtps/builtin/discovery/endpoint/EDPClient.h>
+#include <rtps/builtin/discovery/participant/PDPClient.h>
+#include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
+#include <utils/shared_mutex.hpp>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp
@@ -28,12 +28,12 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/utils/shared_mutex.hpp>
 
 #include <rtps/messages/MessageReceiver.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <statistics/rtps/messages/RTPSStatisticsMessages.hpp>
 #include <statistics/rtps/StatisticsBase.hpp>
+#include <utils/shared_mutex.hpp>
 
 #define INFO_SRC_SUBMSG_LENGTH 20
 

diff --git a/src/cpp/rtps/messages/MessageReceiver.h b/src/cpp/rtps/messages/MessageReceiver.h
@@ -25,7 +25,8 @@
 
 #include <fastdds/rtps/common/all_common.h>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastrtps/utils/shared_mutex.hpp>
+
+#include <utils/shared_mutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h
@@ -46,7 +46,6 @@
 #include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/transport/SenderResource.h>
 #include <fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsQueryable.hpp>
-#include <fastrtps/utils/shared_mutex.hpp>
 
 #include "../flowcontrol/FlowControllerFactory.hpp"
 #include <rtps/messages/MessageReceiver.h>
@@ -56,6 +55,7 @@
 #include <rtps/network/ReceiverResource.h>
 #include <statistics/rtps/StatisticsBase.hpp>
 #include <statistics/types/monitorservice_types.h>
+#include <utils/shared_mutex.hpp>
 #include <utils/Semaphore.hpp>
 
 #if HAVE_SECURITY

diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h
@@ -35,10 +35,10 @@
 #include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/security/authentication/Handshake.h>
 #include <fastdds/rtps/security/common/ParticipantGenericMessage.h>
-#include <fastrtps/utils/shared_mutex.hpp>
 
 #include <rtps/security/ISecurityPluginFactory.h>
 #include <utils/ProxyPool.hpp>
+#include <utils/shared_mutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/writer/LivelinessManager.hpp b/src/cpp/rtps/writer/LivelinessManager.hpp
@@ -22,9 +22,9 @@
 
 #include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
-#include <fastrtps/utils/shared_mutex.hpp>
 
 #include <rtps/writer/LivelinessData.hpp>
+#include <utils/shared_mutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/include/fastrtps/utils/shared_mutex.hpp → src/cpp/utils/shared_mutex.hpp b/include/fastrtps/utils/shared_mutex.hpp → src/cpp/utils/shared_mutex.hpp
diff --git a/test/unittest/utils/CMakeLists.txt b/test/unittest/utils/CMakeLists.txt
@@ -132,7 +132,7 @@ gtest_discover_tests(SystemInfoTests)
 
 add_executable(SharedMutexTests shared_mutex_tests.cpp)
 target_compile_definitions(SharedMutexTests PUBLIC USE_THIRDPARTY_SHARED_MUTEX=1)
-target_include_directories(SharedMutexTests PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(SharedMutexTests PRIVATE ${PROJECT_SOURCE_DIR}/src/cpp)
 target_link_libraries(SharedMutexTests PUBLIC GTest::gtest)
 gtest_discover_tests(SharedMutexTests)
 

diff --git a/test/unittest/utils/shared_mutex_tests.cpp b/test/unittest/utils/shared_mutex_tests.cpp
@@ -8,9 +8,10 @@
 #include <thread>
 #include <vector>
 
-#include <fastrtps/utils/shared_mutex.hpp>
 #include <gtest/gtest.h>
 
+#include <utils/shared_mutex.hpp>
+
 using namespace std;
 using namespace std::chrono;
 using namespace eprosima;