Fixed map-minmax stress test for HP

diff --git a/test/stress/map/minmax/map_minmax.cpp b/test/stress/map/minmax/map_minmax.cpp
index 1d2a7fcc6adb7923ca6d976a3160f211655a59aa..fd7f6729adabe75932beb28333cea75e2860e951 100644 (file)
--- a/test/stress/map/minmax/map_minmax.cpp
+++ b/test/stress/map/minmax/map_minmax.cpp
@@ -37,8 +37,8 @@ namespace map {
     size_t  Map_MinMax::s_nExtractThreadCount = 4;
     size_t  Map_MinMax::s_nPassCount = 1000;
 
-    //size_t Map_MinMax::s_nFeldmanMap_HeadBits = 8;
-    //size_t Map_MinMax::s_nFeldmanMap_ArrayBits = 8;
+    size_t Map_MinMax::s_nFeldmanMap_HeadBits = 8;
+    size_t Map_MinMax::s_nFeldmanMap_ArrayBits = 8;
 
     void Map_MinMax::SetUpTestCase()
     {
@@ -60,13 +60,13 @@ namespace map {
         if ( s_nPassCount == 0 )
             s_nPassCount = 100;
 
-        //s_nFeldmanMap_HeadBits = cfg.get_size_t( "FeldmanMapHeadBits", s_nFeldmanMap_HeadBits );
-        //if ( s_nFeldmanMap_HeadBits == 0 )
-        //    s_nFeldmanMap_HeadBits = 4;
+        s_nFeldmanMap_HeadBits = cfg.get_size_t( "FeldmanMapHeadBits", s_nFeldmanMap_HeadBits );
+        if ( s_nFeldmanMap_HeadBits == 0 )
+            s_nFeldmanMap_HeadBits = 4;
 
-        //s_nFeldmanMap_ArrayBits = cfg.get_size_t( "FeldmanMapArrayBits", s_nFeldmanMap_ArrayBits );
-        //if ( s_nFeldmanMap_ArrayBits == 0 )
-        //    s_nFeldmanMap_ArrayBits = 4;
+        s_nFeldmanMap_ArrayBits = cfg.get_size_t( "FeldmanMapArrayBits", s_nFeldmanMap_ArrayBits );
+        if ( s_nFeldmanMap_ArrayBits == 0 )
+            s_nFeldmanMap_ArrayBits = 4;
     }
 
 } // namespace map

diff --git a/test/stress/map/minmax/map_minmax.h b/test/stress/map/minmax/map_minmax.h
index 2703a056568da21cb598b6eb33f46aea8503c15c..61bb8a1ddb49a657e9f0aff08f53940684e1ff70 100644 (file)
--- a/test/stress/map/minmax/map_minmax.h
+++ b/test/stress/map/minmax/map_minmax.h
@@ -41,8 +41,8 @@ namespace map {
         static size_t s_nMapSize;             // max map size
         static size_t s_nPassCount;
 
-        //static size_t s_nFeldmanMap_HeadBits;
-        //static size_t s_nFeldmanMap_ArrayBits;
+        static size_t s_nFeldmanMap_HeadBits;
+        static size_t s_nFeldmanMap_ArrayBits;
 
         static size_t  s_nLoadFactor;  // current load factor
 
@@ -194,6 +194,22 @@ namespace map {
                         ++m_nDeleteMaxFailed;
 
                 } while ( fixture.m_nInsThreadCount.load( atomics::memory_order_acquire ) != 0 );
+
+                gp = rMap.extract_min();
+                if ( gp ) {
+                    if ( gp->first == keyMin )
+                        ++m_nDeleteMin;
+                }
+                else
+                    ++m_nDeleteMinFailed;
+
+                gp = rMap.extract_max();
+                if ( gp ) {
+                    if ( gp->first == keyMax )
+                        ++m_nDeleteMax;
+                }
+                else
+                    ++m_nDeleteMaxFailed;
             }
         };