Fixed TSan annotations

diff --git a/cds/compiler/feature_tsan.h b/cds/compiler/feature_tsan.h
index 8ebcc857c43f34ea48064559d99f02b0c25e4b42..f2ceaa8327add9cd676ff52b503945485ab7e0da 100644 (file)
--- a/cds/compiler/feature_tsan.h
+++ b/cds/compiler/feature_tsan.h
@@ -40,17 +40,17 @@
 \r
 #else // CDS_THREAD_SANITIZER_ENABLED\r
 \r
 \r
 #else // CDS_THREAD_SANITIZER_ENABLED\r
 \r

-#   define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr)   (void)\r
-#   define CDS_TSAN_ANNOTATE_HAPPENS_AFTER(addr)    (void)
+#   define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr)\r
+#   define CDS_TSAN_ANNOTATE_HAPPENS_AFTER(addr)

 
 

-#   define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN     (void)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_READS_END       (void)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN    (void)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END      (void)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN        (void)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_RW_END          (void)\r
-\r
-#   define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz ) (void)\r
+#   define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN\r
+#   define CDS_TSAN_ANNOTATE_IGNORE_READS_END\r
+#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN\r
+#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END\r
+#   define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN\r
+#   define CDS_TSAN_ANNOTATE_IGNORE_RW_END\r
+\r
+#   define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz )\r

 \r
 #endif
 
 \r
 #endif
 

diff --git a/tools/tsan-suppression b/tools/tsan-suppression
index f46e16d8698fe7f532e77c7f426924514875d414..45c24847511e5851297d5c9db858264957a36c84 100644 (file)
--- a/tools/tsan-suppression
+++ b/tools/tsan-suppression
@@ -7,4 +7,5 @@ race:cds::gc::details::retired_ptr::free
 # uRCU false positive
 race:cds::urcu::gc*::batch_retire*
 
 # uRCU false positive
 race:cds::urcu::gc*::batch_retire*
 

+# TODO: TSan false positive or library issues?

 race:cds::container::OptimisticQueue*::alloc_node
 race:cds::container::OptimisticQueue*::alloc_node