From d73b1a2dc1d1db48d974237ae4e7b051b6c39fe1 Mon Sep 17 00:00:00 2001 From: khizmax Date: Fri, 29 Jul 2016 12:20:13 +0300 Subject: [PATCH] Revert prev change --- cds/intrusive/mspriority_queue.h | 3 ++- test/stress/pqueue/pop.cpp | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/cds/intrusive/mspriority_queue.h b/cds/intrusive/mspriority_queue.h index 6c782728..41fd5689 100644 --- a/cds/intrusive/mspriority_queue.h +++ b/cds/intrusive/mspriority_queue.h @@ -323,7 +323,8 @@ namespace cds { namespace intrusive { m_Stat.onPopFailed(); return nullptr; } - counter_type nBottom = m_ItemCounter.dec(); + counter_type nBottom = m_ItemCounter.reversed_value(); + m_ItemCounter.dec(); assert( nBottom < m_Heap.capacity() ); assert( nBottom > 0 ); diff --git a/test/stress/pqueue/pop.cpp b/test/stress/pqueue/pop.cpp index 75704ed7..a5253195 100644 --- a/test/stress/pqueue/pop.cpp +++ b/test/stress/pqueue/pop.cpp @@ -70,25 +70,6 @@ namespace { ++m_nPopSuccess; nPrevKey = val.key; - /* - while ( !m_Queue.empty() ) { - if ( m_Queue.pop( val )) { - ++m_nPopSuccess; - if ( val.key > nPrevKey ) { - ++m_nPopError; - m_arrFailedPops.emplace_back( failed_pops{ nPrevKey, val.key } ); - } - else if ( val.key == nPrevKey ) { - ++m_nPopErrorEq; - m_arrFailedPops.emplace_back( failed_pops{ nPrevKey, val.key } ); - } - nPrevKey = val.key; - } - else - ++m_nPopFailed; - } - */ - while ( m_Queue.pop( val )) { ++m_nPopSuccess; if ( val.key > nPrevKey ) { -- 2.34.1