Merge branch 'ldionne-ldionne-cmake' into dev

[libcds.git] / cds / urcu / details / gpb.h

diff --git a/cds/urcu/details/gpb.h b/cds/urcu/details/gpb.h
index e3d744421dbe21dee5a2fe12b9b90e38c94b8b8c..5ad75d130d202372af6d13f5847a20a658259fa5 100644 (file)
--- a/cds/urcu/details/gpb.h
+++ b/cds/urcu/details/gpb.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/
@@ -86,7 +86,9 @@ namespace cds { namespace urcu {
         typedef base_class::thread_gc thread_gc ;   ///< Thread-side RCU part
         typedef typename thread_gc::scoped_lock scoped_lock ; ///< Access lock class
 
-        static bool const c_bBuffered = true ; ///< This RCU buffers disposed elements
+        //@cond
+        static bool const c_bBuffered = true ; ///< Bufferized RCU
+        //@endcond
 
     protected:
         //@cond
@@ -146,7 +148,7 @@ namespace cds { namespace urcu {
             }
         }
 
-        // Return: true - synchronize has been called, false - otherwise
+        // Return: \p true - synchronize has been called, \p false - otherwise
         bool push_buffer( epoch_retired_ptr&& ep )
         {
             bool bPushed = m_Buffer.push( ep );
@@ -191,7 +193,7 @@ namespace cds { namespace urcu {
             When the buffer becomes full \ref synchronize function is called
             to wait for the end of grace period and then to free all pointers from the buffer.
         */
-        virtual void retire_ptr( retired_ptr& p )
+        virtual void retire_ptr( retired_ptr& p ) override
         {
             if ( p.m_p )
                 push_buffer( epoch_retired_ptr( p, m_nCurEpoch.load( atomics::memory_order_relaxed )));
@@ -232,7 +234,6 @@ namespace cds { namespace urcu {
         bool synchronize( epoch_retired_ptr& ep )
         {
             uint64_t nEpoch;
-            atomics::atomic_thread_fence( atomics::memory_order_acquire );
             {
                 std::unique_lock<lock_type> sl( m_Lock );
                 if ( ep.m_p && m_Buffer.push( ep ))
@@ -242,7 +243,6 @@ namespace cds { namespace urcu {
                 flip_and_wait();
             }
             clear_buffer( nEpoch );
-            atomics::atomic_thread_fence( atomics::memory_order_release );
             return true;
         }
         //@endcond