Add support for ThreadSanitizer atomicops API to protobuf - patch from glider@

4f68d92c · xiaofeng@google.com · c9f69500 · 4f68d92c · 4f68d92c
Commit 4f68d92c authored Jul 25, 2013 by xiaofeng@google.com
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

atomicops.h src/google/protobuf/stubs/atomicops.h +4 -1

atomicops_internals_tsan.h src/google/protobuf/stubs/atomicops_internals_tsan.h +0 -0

No files found.
--- a/src/google/protobuf/stubs/atomicops.h
+++ b/src/google/protobuf/stubs/atomicops.h
@@ -160,8 +160,11 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
 #define GOOGLE_PROTOBUF_ATOMICOPS_ERROR \
 #error "Atomic operations are not supported on your platform"

+// ThreadSanitizer, http://clang.llvm.org/docs/ThreadSanitizer.html.
+#if defined(THREAD_SANITIZER)
+#include <google/protobuf/stubs/atomicops_internals_tsan.h>
 // MSVC.
-#if defined(_MSC_VER)
+#elif defined(_MSC_VER)
 #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
 #include <google/protobuf/stubs/atomicops_internals_x86_msvc.h>
 #else

--- a/src/google/protobuf/stubs/atomicops_internals_tsan.h
+++ b/src/google/protobuf/stubs/atomicops_internals_tsan.h