From 94e00712e2cb510229c1ae8ce598eac0150084c3 Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 9 Jul 2015 00:11:11 +0300 Subject: [PATCH] Fixed TSan annotations --- cds/compiler/feature_tsan.h | 20 ++++++++++---------- tools/tsan-suppression | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cds/compiler/feature_tsan.h b/cds/compiler/feature_tsan.h index 8ebcc857..f2ceaa83 100644 --- a/cds/compiler/feature_tsan.h +++ b/cds/compiler/feature_tsan.h @@ -40,17 +40,17 @@ #else // CDS_THREAD_SANITIZER_ENABLED -# define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr) (void) -# define CDS_TSAN_ANNOTATE_HAPPENS_AFTER(addr) (void) +# define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr) +# define CDS_TSAN_ANNOTATE_HAPPENS_AFTER(addr) -# define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN (void) -# define CDS_TSAN_ANNOTATE_IGNORE_READS_END (void) -# define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN (void) -# define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END (void) -# define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN (void) -# define CDS_TSAN_ANNOTATE_IGNORE_RW_END (void) - -# define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz ) (void) +# define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN +# define CDS_TSAN_ANNOTATE_IGNORE_READS_END +# define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN +# define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END +# define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN +# define CDS_TSAN_ANNOTATE_IGNORE_RW_END + +# define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz ) #endif diff --git a/tools/tsan-suppression b/tools/tsan-suppression index f46e16d8..45c24847 100644 --- 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* +# TODO: TSan false positive or library issues? race:cds::container::OptimisticQueue*::alloc_node -- 2.34.1