fixed empy function in flat combiner containers

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

diff --git a/cds/container/fcstack.h b/cds/container/fcstack.h
index 7ef2164ea6706559e2341b9351a5d0fff297ff46..3a2c6815956c8fda1b467349a90cd2e49a88fc8f 100644 (file)
--- a/cds/container/fcstack.h
+++ b/cds/container/fcstack.h
@@ -117,7 +117,8 @@ namespace cds { namespace container {
             op_push = cds::algo::flat_combining::req_Operation, ///< Push
             op_push_move,   ///< Push (move semantics)
             op_pop,         ///< Pop
-            op_clear        ///< Clear
+            op_clear,       ///< Clear
+            op_empty        ///< Empty
         };
 
         /// Flat combining publication list record
@@ -244,10 +245,18 @@ namespace cds { namespace container {
         /**
             If the combining is in process the function waits while combining done.
         */
-        bool empty() const
+        bool empty()
         {
-            m_FlatCombining.wait_while_combining();
-            return m_Stack.empty();
+            fc_record * pRec = m_FlatCombining.acquire_record();
+
+            if ( c_bEliminationEnabled )
+                m_FlatCombining.batch_combine( op_empty, pRec, *this );
+            else
+                m_FlatCombining.combine( op_empty, pRec, *this );
+
+            assert( pRec->is_done() );
+            m_FlatCombining.release_record( pRec );
+            return pRec->bEmpty;
         }
 
         /// Internal statistics
@@ -292,6 +301,9 @@ namespace cds { namespace container {
                 while ( !m_Stack.empty() )
                     m_Stack.pop();
                 break;
+            case op_empty:
+                pRec->bEmpty = m_Stack.empty();
+                break;
             default:
                 assert(false);
                 break;