Merge pull request #1155 from msimberg/remove-shared-mutex

Remove `shared_mutex`
pika-org · Jun 27, 2024 · 7fbad29 · 7fbad29
2 parents 4450229 + 468e6bf
commit 7fbad29
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 1,327 deletions.
diff --git a/docs/api.rst b/docs/api.rst
@@ -39,7 +39,6 @@ These headers are part of the public API, but are currently undocumented.
 - ``pika/mutex.hpp``
 - ``pika/runtime.hpp``
 - ``pika/semaphore.hpp``
-- ``pika/shared_mutex.hpp``
 - ``pika/thread.hpp``
 
 All functionality in a namespace containing ``detail`` and all macros prefixed with ``PIKA_DETAIL``

diff --git a/examples/quickstart/CMakeLists.txt b/examples/quickstart/CMakeLists.txt
@@ -13,8 +13,6 @@ set(example_programs
     hello_world
     latch_example # suffix added to avoid conflict with unit tests
     pipeline1
-    # shared_mutex # Disabled due to unavailable timed suspension timed_wake # Disabled due to
-    # unavailable timed suspension
     use_main_thread
 )
 

diff --git a/examples/quickstart/shared_mutex.cpp b/examples/quickstart/shared_mutex.cpp
diff --git a/libs/pika/include/CMakeLists.txt b/libs/pika/include/CMakeLists.txt
@@ -18,7 +18,6 @@ set(include_headers
     pika/mutex.hpp
     pika/runtime.hpp
     pika/semaphore.hpp
-    pika/shared_mutex.hpp
     pika/stop_token.hpp
     pika/system_error.hpp
     pika/thread.hpp

diff --git a/libs/pika/include/include/pika/shared_mutex.hpp b/libs/pika/include/include/pika/shared_mutex.hpp
diff --git a/libs/pika/synchronization/CMakeLists.txt b/libs/pika/synchronization/CMakeLists.txt
@@ -25,7 +25,6 @@ set(synchronization_headers
     pika/synchronization/no_mutex.hpp
     pika/synchronization/once.hpp
     pika/synchronization/recursive_mutex.hpp
-    pika/synchronization/shared_mutex.hpp
     pika/synchronization/sliding_semaphore.hpp
     pika/synchronization/stop_token.hpp
 )

diff --git a/libs/pika/synchronization/docs/index.rst b/libs/pika/synchronization/docs/index.rst
@@ -23,7 +23,6 @@ the C++ standard ones in |pika| threads:
 * :cpp:class:`pika::no_mutex`
 * :cpp:class:`pika::once_flag`
 * :cpp:class:`pika::recursive_mutex`
-* :cpp:class:`pika::shared_mutex`
 * :cpp:class:`pika::sliding_semaphore`
 * :cpp:class:`pika::detail::spinlock_pool`
 

diff --git a/libs/pika/synchronization/include/pika/synchronization/shared_mutex.hpp b/libs/pika/synchronization/include/pika/synchronization/shared_mutex.hpp
diff --git a/libs/pika/synchronization/tests/regressions/CMakeLists.txt b/libs/pika/synchronization/tests/regressions/CMakeLists.txt
@@ -4,10 +4,8 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-set(tests ignore_while_locked_1485 shared_mutex_1702)
+set(tests ignore_while_locked_1485)
 
-set(shared_mutex_1702_PARAMETERS THREADS 4)
-set(shared_mutex_1702_LIBRARIES pika_dependencies_boost)
 set(ignore_while_locked_1485_PARAMETERS THREADS 2)
 
 # Create test cases