Use __tsan_atomic_thread_fence in lib/portaudio/pa_memorybarrier.h

daschuer · Nov 15, 2024 · 91213b4 · 91213b4
1 parent eb54636
commit 91213b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2642,6 +2642,7 @@ target_link_libraries(mixxx-lib PUBLIC PortAudio::PortAudio)
 add_library(PortAudioRingBuffer STATIC EXCLUDE_FROM_ALL
   lib/portaudio/pa_ringbuffer.c
 )
+target_compile_options(PortAudioRingBuffer PUBLIC -fsanitize=thread)
 target_include_directories(mixxx-lib SYSTEM PUBLIC lib/portaudio)
 target_link_libraries(mixxx-lib PRIVATE PortAudioRingBuffer)
 

diff --git a/lib/portaudio/pa_memorybarrier.h b/lib/portaudio/pa_memorybarrier.h
@@ -60,7 +60,20 @@
  *
  ****************/
 
-#if defined(__APPLE__)
+// clang can use __has_feature(thread_sanitizer) gcc sets __SANITIZE_THREAD__
+#ifdef __has_feature
+#if __has_feature(thread_sanitizer)
+# define __SANITIZE_THREAD__ 1
+#endif
+#endif
+
+#if defined(__SANITIZE_THREAD__) && __has_include(<sanitizer/tsan_interface_atomic.h>)
+#  include <sanitizer/tsan_interface_atomic.h>
+#  warning Building under Thread Sanitizer!
+#  define PaUtil_FullMemoryBarrier()  __tsan_atomic_thread_fence(__tsan_memory_order_seq_cst)
+#  define PaUtil_ReadMemoryBarrier()  __tsan_atomic_thread_fence(__tsan_memory_order_acquire)
+#  define PaUtil_WriteMemoryBarrier() __tsan_atomic_thread_fence(__tsan_memory_order_release)
+#elif defined(__APPLE__)
 /* Support for the atomic library was added in C11.
  */
 #   if (__STDC_VERSION__ < 201112L) || defined(__STDC_NO_ATOMICS__)