Attempt at fixing deadlock in test.

stlab · Jan 25, 2025 · 0128f6c · 0128f6c
1 parent d1b9a7a
commit 0128f6c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -21,6 +21,19 @@
                 "stlab.coverage": "OFF"
             }
         },
+        {
+            "name": "debug-cpp20-tsan-ubsan-portable",
+            "description": "Ninja Debug Build",
+            "hidden": false,
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/ninja-cpp20-debug-thread-undefined",
+            "cacheVariables": {
+                "CMAKE_CXX_STANDARD": "20",
+                "CMAKE_BUILD_TYPE": "DEBUG",
+                "STLAB_TASK_SYSTEM": "portable",
+                "CMAKE_CXX_FLAGS": "-fsanitize=thread -fsanitize=undefined"
+            }
+        },
         {
             "name": "ninja-cpp20-debug-thread-undefined",
             "description": "Ninja Debug Build",

diff --git a/test/future_test_helper.hpp b/test/future_test_helper.hpp
@@ -202,7 +202,7 @@ class blocking_policy {
         lock_t lock(*_context->_mutex);
 
         while (!_context->_go || !_context->_may_proceed) {
-            _context->_thread_block.wait(lock);
+            invoke_waiting([&]{ _context->_thread_block.wait(lock); });
         }
     }
 };