Refactored Map_find_string MT-test

[libcds.git] / tests / unit / map2 / map_find_string.cpp

diff --git a/tests/unit/map2/map_find_string.cpp b/tests/unit/map2/map_find_string.cpp
index c0629f434e929034987c2ce9e8bf67c9d67ccc8c..6ccadef365cf1a2b692a3649cecb2a164888bb33 100644 (file)
--- a/tests/unit/map2/map_find_string.cpp
+++ b/tests/unit/map2/map_find_string.cpp
@@ -5,13 +5,6 @@
 namespace map2 {
     CPPUNIT_TEST_SUITE_REGISTRATION( Map_find_string );
 
-    size_t Map_find_string::c_nThreadCount = 8      ;  // thread count
-    size_t Map_find_string::c_nMapSize = 20000000   ;  // map size (count of searching item)
-    size_t Map_find_string::c_nPercentExists = 50   ;  // percent of existing keys in searching sequence
-    size_t Map_find_string::c_nPassCount = 2;
-    size_t Map_find_string::c_nMaxLoadFactor = 8    ;  // maximum load factor
-    bool   Map_find_string::c_bPrintGCState = true;
-
     void Map_find_string::generateSequence()
     {
         size_t nPercent = c_nPercentExists;
@@ -21,59 +14,47 @@ namespace map2 {
         else if ( nPercent < 1 )
             nPercent = 1;
 
-        m_nRealMapSize = 0;
-
-        std::vector<std::string> const & arrString = CppUnitMini::TestCase::getTestStrings();
+        std::vector<std::string> const& arrString = CppUnitMini::TestCase::getTestStrings();
         size_t nSize = arrString.size();
         if ( nSize > c_nMapSize )
             nSize = c_nMapSize;
         m_Arr.resize( nSize );
+
+        nSize = 0;
         for ( size_t i = 0; i < nSize; ++i ) {
             m_Arr[i].pKey = &( arrString[i] );
             m_Arr[i].bExists = CppUnitMini::Rand( 100 ) <= nPercent;
             if ( m_Arr[i].bExists )
-                ++m_nRealMapSize;
-        }
-    }
-
-    void Map_find_string::initTestSequence()
-    {
-        if ( !m_bSeqInit ) {
-            m_bSeqInit = true;
-
-            CPPUNIT_MSG( "Generating test data...");
-            cds::OS::Timer    timer;
-            generateSequence();
-            CPPUNIT_MSG( "   Duration=" << timer.duration() );
-            CPPUNIT_MSG( "Map size=" << m_nRealMapSize << " find key loop=" << m_Arr.size() << " (" << c_nPercentExists << "% success)" );
-            CPPUNIT_MSG( "Thread count=" << c_nThreadCount << " Pass count=" << c_nPassCount );
+                ++nSize;
         }
+        c_nMapSize = nSize;
     }
 
     void Map_find_string::setUpParams( const CppUnitMini::TestCfg& cfg )
     {
         c_nThreadCount = cfg.getSizeT("ThreadCount", c_nThreadCount );
-        c_nMapSize = cfg.getSizeT("MapSize", c_nMapSize );
-        c_nPercentExists = cfg.getSizeT("PercentExists", c_nPercentExists );
-        c_nPassCount = cfg.getSizeT("PassCount", c_nPassCount );
-        c_nMaxLoadFactor = cfg.getSizeT("MaxLoadFactor", c_nMaxLoadFactor );
-        c_bPrintGCState = cfg.getBool("PrintGCStateFlag", true );
-    }
+        c_nMapSize = cfg.getSizeT("MapSize", c_nMapSize);
+        c_nPercentExists = cfg.getSizeT("PercentExists", c_nPercentExists);
+        c_nPassCount = cfg.getSizeT("PassCount", c_nPassCount);
+        c_nMaxLoadFactor = cfg.getSizeT("MaxLoadFactor", c_nMaxLoadFactor);
+        c_bPrintGCState = cfg.getBool("PrintGCStateFlag", c_bPrintGCState );
 
-    void Map_find_string::myRun(const char *in_name, bool invert /*= false*/)
-    {
-        setUpParams( m_Cfg.get( "Map_find_string" ));
+        c_nCuckooInitialSize = cfg.getSizeT("CuckooInitialSize", c_nCuckooInitialSize);
+        c_nCuckooProbesetSize = cfg.getSizeT("CuckooProbesetSize", c_nCuckooProbesetSize);
+        c_nCuckooProbesetThreshold = cfg.getSizeT("CuckooProbesetThreshold", c_nCuckooProbesetThreshold);
+
+        c_nMultiLevelMap_HeadBits = cfg.getSizeT("MultiLevelMapHeadBits", c_nMultiLevelMap_HeadBits);
+        c_nMultiLevelMap_ArrayBits = cfg.getSizeT("MultiLevelMapArrayBits", c_nMultiLevelMap_ArrayBits);
+
+        if ( c_nThreadCount == 0 )
+            c_nThreadCount = std::thread::hardware_concurrency();
 
-        run_MichaelMap(in_name, invert);
-        run_SplitList(in_name, invert);
-        run_SkipListMap(in_name, invert);
-        run_EllenBinTreeMap(in_name, invert);
-        run_BronsonAVLTreeMap(in_name, invert);
-        run_StripedMap(in_name, invert);
-        run_RefinableMap(in_name, invert);
-        run_CuckooMap(in_name, invert);
-        run_StdMap(in_name, invert);
+        CPPUNIT_MSG( "Generating test data...");
+        cds::OS::Timer    timer;
+        generateSequence();
+        CPPUNIT_MSG( "   Duration=" << timer.duration() );
+        CPPUNIT_MSG( "Map size=" << c_nMapSize << " find key loop=" << m_Arr.size() << " (" << c_nPercentExists << "% success)" );
+        CPPUNIT_MSG( "Thread count=" << c_nThreadCount << " Pass count=" << c_nPassCount );
 
-        endTestCase();
     }
 } // namespace map2