Merge pull request #950 from msimberg/resource-partitioner-valgrind

Enable valgrind testing in `resource_partitioner` module
pika-org · Jan 11, 2024 · 274b600 · 274b600
2 parents 9e77b93 + acaa4fa
commit 274b600
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/linux_valgrind.yml b/.github/workflows/linux_valgrind.yml
@@ -78,6 +78,7 @@ jobs:
               tests.{regressions,unit}.modules.functional \
               tests.unit.modules.memory \
               tests.unit.modules.properties \
+              tests.{examples,regressions,unit}.modules.resource_partitioner \
               tests.unit.modules.runtime \
               tests.unit.modules.schedulers \
               tests.unit.modules.string_util \

diff --git a/libs/pika/resource_partitioner/examples/CMakeLists.txt b/libs/pika/resource_partitioner/examples/CMakeLists.txt
@@ -59,7 +59,7 @@ foreach(example_program ${example_programs})
   if(PIKA_WITH_TESTS AND PIKA_WITH_TESTS_EXAMPLES)
     pika_add_example_test(
       "modules.resource_partitioner" ${example_program}
-      ${${example_program}_PARAMETERS}
+      ${${example_program}_PARAMETERS} VALGRIND
     )
   endif()
 endforeach()
diff --git a/libs/pika/resource_partitioner/tests/regressions/CMakeLists.txt b/libs/pika/resource_partitioner/tests/regressions/CMakeLists.txt
@@ -20,7 +20,7 @@ foreach(test ${tests})
   )
 
   pika_add_regression_test(
-    "modules.resource_partitioner" ${test} ${${test}_PARAMETERS}
+    "modules.resource_partitioner" ${test} ${${test}_PARAMETERS} VALGRIND
   )
 
 endforeach()
diff --git a/libs/pika/resource_partitioner/tests/unit/CMakeLists.txt b/libs/pika/resource_partitioner/tests/unit/CMakeLists.txt
@@ -52,7 +52,7 @@ foreach(test ${tests})
   )
 
   pika_add_unit_test(
-    "modules.resource_partitioner" ${test} ${${test}_PARAMETERS}
+    "modules.resource_partitioner" ${test} ${${test}_PARAMETERS} VALGRIND
   )
 
 endforeach()
diff --git a/libs/pika/schedulers/include/pika/schedulers/queue_holder_thread.hpp b/libs/pika/schedulers/include/pika/schedulers/queue_holder_thread.hpp
@@ -508,12 +508,7 @@ namespace pika::threads::detail {
         }
 
         // ----------------------------------------------------------------
-        static void deallocate(threads::detail::thread_data* p)
-        {
-            using threads::detail::thread_data;
-            p->~thread_data();
-            thread_alloc_.deallocate(p, 1);
-        }
+        static void deallocate(threads::detail::thread_data* p) { p->destroy(); }
 
         // ----------------------------------------------------------------
         void add_to_thread_map(threads::detail::thread_id_type tid)