[TSan] Tuning memory order

diff --git a/cds/compiler/feature_tsan.h b/cds/compiler/feature_tsan.h
index 2f700c653626a71b82b53b63ae51f1069ddf43ea..3f6e67baa161594d2ca762aeca0364cc35d6bfcd 100644 (file)
--- a/cds/compiler/feature_tsan.h
+++ b/cds/compiler/feature_tsan.h
@@ -51,6 +51,7 @@
                                                     CDS_TSAN_ANNOTATE_IGNORE_WRITES_END;\
                                                     CDS_TSAN_ANNOTATE_IGNORE_READS_END
 #   define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz ) AnnotateNewMemory( __FILE__, __LINE__, reinterpret_cast<void *>(addr), sz )
+#   define CDS_TSAN_ANNOTATE_PUBLISH_MEMORY_RANGE( addr, sz ) AnnotatePublishMemoryRange( __FILE__, __LINE__, reinterpret_cast<void *>(addr), sz )
 
 #   define CDS_TSAN_ANNOTATE_MUTEX_CREATE( addr )    AnnotateRWLockCreate( __FILE__, __LINE__, reinterpret_cast<void *>(addr))
 #   define CDS_TSAN_ANNOTATE_MUTEX_DESTROY( addr )   AnnotateRWLockDestroy( __FILE__, __LINE__, reinterpret_cast<void *>(addr))
@@ -69,7 +70,8 @@
         void AnnotateIgnoreWritesBegin(const char *f, int l);
         void AnnotateIgnoreWritesEnd(const char *f, int l);
 
-        void AnnotateNewMemory( const char *f, int l, void * mem, size_t size);
+        void AnnotatePublishMemoryRange( const char *f, int l, void * mem, size_t size )
+        void AnnotateNewMemory( const char *f, int l, void * mem, size_t size );
 
         void AnnotateRWLockCreate( const char *f, int l, void* m );
         void AnnotateRWLockDestroy( const char *f, int l, void* m );
@@ -89,6 +91,7 @@
 #   define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN
 #   define CDS_TSAN_ANNOTATE_IGNORE_RW_END
 
+#   define CDS_TSAN_ANNOTATE_PUBLISH_MEMORY_RANGE( addr, sz )
 #   define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz )
 
 #   define CDS_TSAN_ANNOTATE_MUTEX_CREATE( addr )

diff --git a/cds/memory/michael/allocator.h b/cds/memory/michael/allocator.h
index 4ef0f6d832fccc065eddf53df258d4dd5c66611d..cdb12a37cf5803e4671835d8411b0c6ceaf76d14 100644 (file)
--- a/cds/memory/michael/allocator.h
+++ b/cds/memory/michael/allocator.h
@@ -1703,7 +1703,7 @@ namespace michael {
                 );
             }
 
-            CDS_TSAN_ANNOTATE_NEW_MEMORY( pBlock + 1, nSize );
+            CDS_TSAN_ANNOTATE_PUBLISH_MEMORY_RANGE( pBlock + 1, nSize );
             return pBlock + 1;
         }
 

diff --git a/cds/urcu/details/base.h b/cds/urcu/details/base.h
index 84bf8fb85a205449775f35a5d237443eca2de05d..21676d82f6b688e9c1b5ad1399ec45384412dd89 100644 (file)
--- a/cds/urcu/details/base.h
+++ b/cds/urcu/details/base.h
@@ -375,12 +375,12 @@ namespace cds {
                     // No records available for reuse
                     // Allocate and push a new record
                     pRec = allocator_type().New( curThreadId );
-                    CDS_COMPILER_RW_BARRIER;
 
                     thread_record * pOldHead = m_pHead.load( atomics::memory_order_acquire );
                     do {
+                        // Compiler barriers: assignment MUST BE inside the loop
+                        CDS_COMPILER_RW_BARRIER;
                         pRec->m_list.m_pNext = pOldHead;
-                        // Compiler barrier: assignment above MUST BE inside the loop
                         CDS_COMPILER_RW_BARRIER;
                     } while ( !m_pHead.compare_exchange_weak( pOldHead, pRec, atomics::memory_order_acq_rel, atomics::memory_order_acquire ));
 

diff --git a/src/hp_gc.cpp b/src/hp_gc.cpp
index 08043f42e1932e9678f395a6fe2b102ac5d4d937..15bd2b64bd85eaa6c62231e49a8333eb0a946e5c 100644 (file)
--- a/src/hp_gc.cpp
+++ b/src/hp_gc.cpp
@@ -145,12 +145,12 @@ namespace cds { namespace gc {
             // No HP records available for reuse
             // Allocate and push a new HP record
             hprec = NewHPRec( curThreadId );
-            CDS_COMPILER_RW_BARRIER;
 
             hplist_node * pOldHead = m_pListHead.load( atomics::memory_order_acquire );
             do {
+                // Compiler barriers: assignment MUST BE inside the loop
+                CDS_COMPILER_RW_BARRIER;
                 hprec->m_pNextNode = pOldHead;
-                // Compiler barrier: assignment above MUST BE inside the loop
                 CDS_COMPILER_RW_BARRIER;
             } while ( !m_pListHead.compare_exchange_weak( pOldHead, hprec, atomics::memory_order_acq_rel, atomics::memory_order_acquire ));