improved test error msg

[libcds.git] / test / stress / pqueue / pop.cpp

diff --git a/test/stress/pqueue/pop.cpp b/test/stress/pqueue/pop.cpp
index 8127b0b9b492d173cb46258ae07ac9c0ccb3a127..dca55a30ec1022befd5998fa693d11ceeb6d2d56 100644 (file)
--- a/test/stress/pqueue/pop.cpp
+++ b/test/stress/pqueue/pop.cpp
@@ -70,22 +70,26 @@ 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;
+                    bool prevPopFailed = false;
+                    while ( m_Queue.pop( val )) {
+                        ++m_nPopSuccess;
+                        if ( val.key > nPrevKey ) {
+                            ++m_nPopError;
+                            m_arrFailedPops.emplace_back( failed_pops{ nPrevKey, val.key, static_cast<size_t>(-1) } );
+                            prevPopFailed = true;
                         }
-                        else
-                            ++m_nPopFailed;
+                        else if ( val.key == nPrevKey ) {
+                            ++m_nPopErrorEq;
+                            m_arrFailedPops.emplace_back( failed_pops{ nPrevKey, val.key, static_cast<size_t>(-1) } );
+                        }
+                        else {
+                            if ( prevPopFailed )
+                                m_arrFailedPops.back().next_key = val.key;
+                            prevPopFailed = false;
+                        }
+                        nPrevKey = val.key;
                     }
+
                 }
                 else
                     ++m_nPopFailed;
@@ -101,6 +105,7 @@ namespace {
             struct failed_pops {
                 size_t prev_key;
                 size_t popped_key;
+                size_t next_key;
             };
             std::vector< failed_pops > m_arrFailedPops;
         };
@@ -155,7 +160,8 @@ namespace {
                     if ( !cons.m_arrFailedPops.empty() ) {
                         std::cerr << "Priority violations, thread " << i;
                         for ( size_t k = 0; k < cons.m_arrFailedPops.size(); ++k ) {
-                            std::cerr << "\n    " << "prev_key=" << cons.m_arrFailedPops[k].prev_key << " popped_key=" << cons.m_arrFailedPops[k].popped_key;
+                            std::cerr << "\n    " << "prev_key=" << cons.m_arrFailedPops[k].prev_key << " popped_key=" << cons.m_arrFailedPops[k].popped_key
+                                << " next_key=" << cons.m_arrFailedPops[k].next_key;
                         }
                         std::cerr << std::endl;
                     }