From: khizmax <libcds.dev@gmail.com>
Date: Thu, 19 Mar 2015 21:30:01 +0000 (+0300)
Subject: Improved checking of internal consistency for BronsonAVLTree
X-Git-Tag: v2.1.0~296^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=319c5ae4f25d496470289648839e29838a6fd0d9;p=libcds.git

Improved checking of internal consistency for BronsonAVLTree
---

diff --git a/cds/container/impl/bronson_avltree_map_rcu.h b/cds/container/impl/bronson_avltree_map_rcu.h
index 0439e7df..775f6319 100644
--- a/cds/container/impl/bronson_avltree_map_rcu.h
+++ b/cds/container/impl/bronson_avltree_map_rcu.h
@@ -762,8 +762,16 @@ namespace cds { namespace container {
         size_t do_check_consistency( node_type * pNode, size_t nLevel, Func f, size_t& nErrors ) const
         {
             if ( pNode ) {
-                size_t hLeft = do_check_consistency( child( pNode, left_child, memory_model::memory_order_relaxed ), nLevel + 1, f, nErrors );
-                size_t hRight = do_check_consistency( child( pNode, right_child, memory_model::memory_order_relaxed ), nLevel + 1, f, nErrors );
+                key_comparator cmp;
+                node_type * pLeft = child( pNode, left_child, memory_model::memory_order_relaxed );
+                node_type * pRight = child( pNode, right_child, memory_model::memory_order_relaxed );
+                if ( pLeft && cmp( pLeft->m_key, pNode->m_key ) > 0 )
+                    ++nErrors;
+                if (  pRight && cmp( pNode->m_key, pRight->m_key ) > 0 )
+                    ++nErrors;
+
+                size_t hLeft = do_check_consistency( pLeft, nLevel + 1, f, nErrors );
+                size_t hRight = do_check_consistency( pRight, nLevel + 1, f, nErrors );
 
                 if ( hLeft >= hRight ) {
                     if ( hLeft - hRight > 1 ) {
diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index 4417b028..e898f82c 100644
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -1938,10 +1938,11 @@ namespace map2 {
     static inline void check_before_cleanup( cc::BronsonAVLTreeMap<GC, Key, T, Traits>& m )
     {
         CPPUNIT_MSG( "  Check internal consistency (single-threaded)..." );
-        m.check_consistency([]( size_t nLevel, size_t hLeft, size_t hRight )
+        bool bOk = m.check_consistency([]( size_t nLevel, size_t hLeft, size_t hRight )
             { 
                 CPPUNIT_MSG( "Tree violation on level=" << nLevel << ": hLeft=" << hLeft << ", hRight=" << hRight ) 
             });
+        CPPUNIT_CHECK_CURRENT_EX( bOk, "check_consistency failed");
     }
 
     template <typename K, typename V, typename Traits>