Merge branch 'master' into dev

[libcds.git] / cds / container / fcqueue.h

diff --git a/cds/container/fcqueue.h b/cds/container/fcqueue.h
index 03daa01461f7ef2d47dc22e53af13e75d44d9860..5c5d76478087413fd848233c25690b942a718444 100644 (file)
--- a/cds/container/fcqueue.h
+++ b/cds/container/fcqueue.h
@@ -1,7 +1,7 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
@@ -194,7 +194,7 @@ namespace cds { namespace container {
             else
                 m_FlatCombining.combine( op_enq, pRec, *this );
 
-            assert( pRec->is_done() );
+            assert( pRec->is_done());
             m_FlatCombining.release_record( pRec );
             m_FlatCombining.internal_statistics().onEnqueue();
             return true;
@@ -220,7 +220,7 @@ namespace cds { namespace container {
             else
                 m_FlatCombining.combine( op_enq_move, pRec, *this );
 
-            assert( pRec->is_done() );
+            assert( pRec->is_done());
             m_FlatCombining.release_record( pRec );
 
             m_FlatCombining.internal_statistics().onEnqMove();
@@ -247,7 +247,7 @@ namespace cds { namespace container {
             else
                 m_FlatCombining.combine( op_deq, pRec, *this );
 
-            assert( pRec->is_done() );
+            assert( pRec->is_done());
             m_FlatCombining.release_record( pRec );
 
             m_FlatCombining.internal_statistics().onDequeue( pRec->bEmpty );
@@ -270,7 +270,7 @@ namespace cds { namespace container {
             else
                 m_FlatCombining.combine( op_clear, pRec, *this );
 
-            assert( pRec->is_done() );
+            assert( pRec->is_done());
             m_FlatCombining.release_record( pRec );
         }
 
@@ -315,17 +315,14 @@ namespace cds { namespace container {
         {
             assert( pRec );
 
-            // this function is called under FC mutex, so switch TSan off
-            CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN;
-
-            switch ( pRec->op() ) {
+            switch ( pRec->op()) {
             case op_enq:
                 assert( pRec->pValEnq );
-                m_Queue.push( *(pRec->pValEnq ) );
+                m_Queue.push( *(pRec->pValEnq ));
                 break;
             case op_enq_move:
                 assert( pRec->pValEnq );
-                m_Queue.push( std::move( *(pRec->pValEnq )) );
+                m_Queue.push( std::move( *(pRec->pValEnq )));
                 break;
             case op_deq:
                 assert( pRec->pValDeq );
@@ -336,14 +333,13 @@ namespace cds { namespace container {
                 }
                 break;
             case op_clear:
-                while ( !m_Queue.empty() )
+                while ( !m_Queue.empty())
                     m_Queue.pop();
                 break;
             default:
                 assert(false);
                 break;
             }
-            CDS_TSAN_ANNOTATE_IGNORE_RW_END;
         }
 
         /// Batch-processing flat combining
@@ -351,15 +347,12 @@ namespace cds { namespace container {
         {
             typedef typename fc_kernel::iterator fc_iterator;
 
-            // this function is called under FC mutex, so switch TSan off
-            CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN;
-
             for ( fc_iterator it = itBegin, itPrev = itEnd; it != itEnd; ++it ) {
-                switch ( it->op() ) {
+                switch ( it->op( atomics::memory_order_acquire )) {
                 case op_enq:
                 case op_enq_move:
                 case op_deq:
-                    if ( m_Queue.empty() ) {
+                    if ( m_Queue.empty()) {
                         if ( itPrev != itEnd && collide( *itPrev, *it ))
                             itPrev = itEnd;
                         else
@@ -368,7 +361,6 @@ namespace cds { namespace container {
                     break;
                 }
             }
-            CDS_TSAN_ANNOTATE_IGNORE_RW_END;
         }
         //@endcond
 
@@ -376,7 +368,7 @@ namespace cds { namespace container {
         //@cond
         bool collide( fc_record& rec1, fc_record& rec2 )
         {
-            switch ( rec1.op() ) {
+            switch ( rec1.op()) {
                 case op_enq:
                     if ( rec2.op() == op_deq ) {
                         assert(rec1.pValEnq);
@@ -396,7 +388,7 @@ namespace cds { namespace container {
                     }
                     break;
                 case op_deq:
-                    switch ( rec2.op() ) {
+                    switch ( rec2.op()) {
                     case op_enq:
                     case op_enq_move:
                         return collide( rec2, rec1 );