Adjusts sequential map test cases

[libcds.git] / test / stress / sequential / sequential-map / insdelfind / map_insdelfind.h

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h
index dd909dc94f80c72a06527ba44a37b56fd0674b7d..f1b03bf8c784e3deb7274ec40f94c31a12c01718 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h
@@ -37,6 +37,15 @@ namespace map {
     {
     public:
         static size_t s_nMapSize;           // initial map size
+
+        static size_t s_nPassCount;
+        static size_t s_nBronsonAVLTreeMapPassCount;
+        static size_t s_nEllenBinTreeMapPassCount;
+        static size_t s_nFeldmanPassCount;
+        static size_t s_nMichaelMapPassCount;
+        static size_t s_nSkipListMapPassCount;
+        static size_t s_nSplitListMapPassCount;
+
         static size_t s_nThreadCount;       // thread count
         static size_t s_nMaxLoadFactor;     // maximum load factor
         static unsigned int s_nInsertPercentage;
@@ -122,12 +131,14 @@ namespace map {
             virtual void test()
             {
                 Map& rMap = m_Map;
+                Map_InsDelFind& fixture = pool().template fixture<Map_InsDelFind>();
+                size_t pass_count = fixture.s_nPassCount;
 
                 unsigned int i = 0;
                 size_t const nNormalize = size_t(-1) / ( s_nMapSize * 2 );
 
                 size_t nRand = 0;
-                while ( !time_elapsed()) {
+                while ( pass_count-- ) {
                     nRand = cds::bitop::RandXorShift( nRand );
                     size_t n = nRand / nNormalize;
                     switch ( s_arrShuffle[i] ) {
@@ -183,56 +194,11 @@ namespace map {
             }
 
             cds_test::thread_pool& pool = get_pool();
-            pool.add( new worker( pool, testMap ), s_nThreadCount );
-
-            propout() << std::make_pair( "thread_count", s_nThreadCount )
-                << std::make_pair( "insert_percentage", s_nInsertPercentage )
-                << std::make_pair( "delete_percentage", s_nDeletePercentage )
-                << std::make_pair( "map_size", s_nMapSize );
-
-            std::chrono::milliseconds duration = pool.run( std::chrono::seconds( s_nDuration ));
-
-            propout() << std::make_pair( "duration", duration );
-
-            size_t nInsertSuccess = 0;
-            size_t nInsertFailed = 0;
-            size_t nDeleteSuccess = 0;
-            size_t nDeleteFailed = 0;
-            size_t nFindSuccess = 0;
-            size_t nFindFailed = 0;
-            for ( size_t i = 0; i < pool.size(); ++i ) {
-                worker& thr = static_cast<worker&>( pool.get( i ));
-
-                nInsertSuccess += thr.m_nInsertSuccess;
-                nInsertFailed += thr.m_nInsertFailed;
-                nDeleteSuccess += thr.m_nDeleteSuccess;
-                nDeleteFailed += thr.m_nDeleteFailed;
-                nFindSuccess += thr.m_nFindSuccess;
-                nFindFailed += thr.m_nFindFailed;
-            }
-
-            propout()
-                << std::make_pair( "insert_success", nInsertSuccess )
-                << std::make_pair( "insert_failed", nInsertFailed )
-                << std::make_pair( "delete_success", nDeleteSuccess )
-                << std::make_pair( "delete_failed", nDeleteFailed )
-                << std::make_pair( "find_success", nFindSuccess )
-                << std::make_pair( "find_failed", nFindFailed )
-                << std::make_pair( "finish_map_size", testMap.size());
-
-            {
-                ASSERT_TRUE( std::chrono::duration_cast<std::chrono::seconds>(duration).count() > 0 );
-                size_t nTotalOps = nInsertSuccess + nInsertFailed + nDeleteSuccess + nDeleteFailed + nFindSuccess + nFindFailed;
-                propout() << std::make_pair( "avg_speed", nTotalOps / std::chrono::duration_cast<std::chrono::seconds>( duration ).count());
-            }
-
-            check_before_cleanup( testMap );
+            std::unique_ptr<worker> worker_thrd(new worker(pool, testMap));
+            worker_thrd->test();
 
             testMap.clear();
             EXPECT_TRUE( testMap.empty());
-
-            additional_check( testMap );
-            print_stat( propout(), testMap );
             additional_cleanup( testMap );
         }
 
@@ -242,6 +208,34 @@ namespace map {
             Map testMap( *this );
             do_test( testMap );
         }
+
+        template <class Map>
+        void run_bronson_avl_tree() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nBronsonAVLTreeMapPassCount;
+          run_test<Map>();
+        }
+
+        template <class Map>
+        void run_ellen_bin_tree() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nEllenBinTreeMapPassCount;
+          run_test<Map>();
+        }
+
+        template <class Map>
+        void run_skip_list() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nSkipListMapPassCount;
+          run_test<Map>();
+        }
+
+        template <class Map>
+        void run_feldman() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nFeldmanPassCount;
+          run_test<Map>();
+        }
     };
 
     class Map_InsDelFind_LF: public Map_InsDelFind
@@ -256,6 +250,20 @@ namespace map {
             Map_InsDelFind::run_test<Map>();
         }
 
+                               template <class Map>
+        void run_michael() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nMichaelMapPassCount;
+          Map_InsDelFind_LF::run_test<Map>();
+        }
+
+        template <class Map>
+        void run_split_list() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nSplitListMapPassCount;
+          Map_InsDelFind_LF::run_test<Map>();
+        }
+
         static std::vector<size_t> get_load_factors();
     };