[15174] Add new CMake option to allow users to enforce use of our third party shared_mutex

CMakeLists.txt

@@ -207,6 +207,15 @@ endif()
 
 option(SQLITE3_SUPPORT "Activate SQLITE3 support" ON)
 
+option(USE_THIRDPARTY_SHARED_MUTEX [=[
+Forces the use of a Boost-based shared_mutex implementation
+instead of the framework one. Useful to cope with issues on
+framework implementations like misguided sanitizer reports.
+This implementation will be used by default on frameworks
+lacking the shared_mutex feature like those not fulfilling
+C++17.
+]=] OFF)
+
 ###############################################################################
 # SHM as Default transport
 ###############################################################################

include/fastrtps/config.h.in

@@ -62,6 +62,8 @@
 #define HAVE_SQLITE3 @HAVE_SQLITE3@
 #endif /* ifndef HAVE_SQLITE3 */
 
+// Using thirdparty shared_mutex
+#cmakedefine01 USE_THIRDPARTY_SHARED_MUTEX
 
 // TLS support
 #ifndef TLS_FOUND

include/fastrtps/utils/shared_mutex.hpp

@@ -8,12 +8,23 @@
 #ifndef _UTILS_SHARED_MUTEX_HPP_
 #define _UTILS_SHARED_MUTEX_HPP_
 
+#ifndef USE_THIRDPARTY_SHARED_MUTEX
+#   if defined(_MSC_VER) && _MSVC_LANG < 202302L
+#       pragma message("warning: USE_THIRDPARTY_SHARED_MUTEX not defined. By default use framework version.")
+#   else
+#       warning "USE_THIRDPARTY_SHARED_MUTEX not defined. By default use framework version."
+#   endif // if defined(_MSC_VER) && _MSVC_LANG < 202302L
+#   define USE_THIRDPARTY_SHARED_MUTEX 0
+#endif // ifndef USE_THIRDPARTY_SHARED_MUTEX
+
 #if defined(__has_include) && __has_include(<version>)
 #   include <version>
 #endif // if defined(__has_include) && __has_include(<version>)
 
 // Detect if the share_mutex feature is available
 #if defined(__has_include) && __has_include(<version>) && !defined(__cpp_lib_shared_mutex) || \
+    /* allow users to ignore shared_mutex framework implementation */ \
+    (~USE_THIRDPARTY_SHARED_MUTEX + 1) || \
     /* deprecated procedure if the good one is not available*/ \
     ( !(defined(__has_include) && __has_include(<version>)) && \
     !(defined(HAVE_CXX17) && HAVE_CXX17) &&  __cplusplus < 201703 )
@@ -353,9 +364,8 @@ shared_lock<Mutex>::try_lock()
 
 namespace eprosima {
 
-using shared_mutex = std::shared_mutex;
-template< class Mutex >
-using shared_lock = std::shared_lock<Mutex>;
+using std::shared_mutex;
+using std::shared_lock;
 
 } //namespace eprosima
 

src/cpp/CMakeLists.txt

@@ -565,10 +565,10 @@ endif()
 
 install(TARGETS ${PROJECT_NAME} eProsima_atomic
     EXPORT ${PROJECT_NAME}-${FASTDDS_LINKING}-targets
+    COMPONENT libraries
     RUNTIME DESTINATION ${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}
     LIBRARY DESTINATION ${LIB_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}
-    COMPONENT libraries
     )
 
 export(TARGETS ${PROJECT_NAME} eProsima_atomic FILE ${PROJECT_BINARY_DIR}/cmake/config/${PROJECT_NAME}-${FASTDDS_LINKING}-targets.cmake)

src/cpp/rtps/participant/RTPSParticipantImpl.h

@@ -28,9 +28,6 @@
 #include <mutex>
 #include <sys/types.h>
 
-#include <fastrtps/utils/Semaphore.h>
-#include <fastrtps/utils/shared_mutex.hpp>
-
 #if defined(_WIN32)
 #include <process.h>
 #else
@@ -68,6 +65,9 @@
 #include <rtps/security/SecurityManager.h>
 #endif // if HAVE_SECURITY
 
+#include <fastrtps/utils/Semaphore.h>
+#include <fastrtps/utils/shared_mutex.hpp>
+
 namespace eprosima {
 
 namespace fastdds {

versions.md

@@ -1,3 +1,8 @@
+Version 2.7.1
+-------------
+
+* Added a new CMake option to allow users to force the use of our third party shared_mutex
+
 Version 2.7.0
 -------------