Only activates insdelfind for sequential set test case

diff --git a/test/stress/sequential/sequential-map/CMakeLists.txt b/test/stress/sequential/sequential-map/CMakeLists.txt
index 6cd9e103a210fc0dfe1de763df5334f813de67bd..2a1bd29afb01573055a27e016e99876dc0fad773 100644 (file)
--- a/test/stress/sequential/sequential-map/CMakeLists.txt
+++ b/test/stress/sequential/sequential-map/CMakeLists.txt
@@ -1,25 +1,25 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCDSUNIT_USE_URCU")
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/delodd)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/del3)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/find_string)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_func)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_string)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_item_int)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/delodd)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/del3)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/find_string)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_func)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_string)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_item_int)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdelfind)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/minmax)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/minmax)
 #add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/iter_erase)
 
 add_custom_target( stress-sequential-map
     DEPENDS
-        stress-sequential-map-delodd
-        stress-sequential-map-del3
-        stress-sequential-map-find-string
-        stress-sequential-map-insdel-func
-        stress-sequential-map-insdel-string
-        stress-sequential-map-insdel-item-int
+        #stress-sequential-map-delodd
+        #stress-sequential-map-del3
+        #stress-sequential-map-find-string
+        #stress-sequential-map-insdel-func
+        #stress-sequential-map-insdel-string
+        #stress-sequential-map-insdel-item-int
         stress-sequential-map-insdelfind
-        stress-sequential-map-minmax
+        #stress-sequential-map-minmax
         #stress-sequential-map-iter-erase
 )

diff --git a/test/stress/sequential/sequential-map/find_string/CMakeLists.txt b/test/stress/sequential/sequential-map/find_string/CMakeLists.txt
index f079ba5cdfca8ed8d0ab0fd4989832252521f5a2..610b997a05008ff3572c7d1be86440d3ccfd1e0d 100644 (file)
--- a/test/stress/sequential/sequential-map/find_string/CMakeLists.txt
+++ b/test/stress/sequential/sequential-map/find_string/CMakeLists.txt
@@ -3,15 +3,15 @@ set(PACKAGE_NAME stress-sequential-map-find-string)
 set(CDSSTRESS_MAP_FIND_STRING_SOURCES
     ../../../main.cpp
     map_find_string.cpp
+    #map_find_string_cuckoo.cpp
+    map_find_string_split.cpp
     map_find_string_bronsonavltree.cpp
-    map_find_string_cuckoo.cpp
     map_find_string_ellentree.cpp
     map_find_string_feldman_hashset.cpp
     map_find_string_michael.cpp
     map_find_string_skip.cpp
-    map_find_string_split.cpp
-    map_find_string_std.cpp
-    map_find_string_striped.cpp
+    #map_find_string_std.cpp
+    #map_find_string_striped.cpp
 )
 
 include_directories(

diff --git a/test/stress/sequential/sequential-map/find_string/map_find_string.cpp b/test/stress/sequential/sequential-map/find_string/map_find_string.cpp
index b4c4c3753baa377af6c9816ee4a89144a5d230c5..5a1a98761804900d7901a05651505a830d6c2fe5 100644 (file)
--- a/test/stress/sequential/sequential-map/find_string/map_find_string.cpp
+++ b/test/stress/sequential/sequential-map/find_string/map_find_string.cpp
@@ -43,6 +43,7 @@ namespace map {
     size_t Map_find_string::s_nEllenBinTreeMapPassCount = 100;
     size_t Map_find_string::s_nMichaelMapPassCount = 100;
     size_t Map_find_string::s_nSkipListMapPassCount = 100;
+    size_t Map_find_string::s_nSplitListMapPassCount = 100;
 
     size_t Map_find_string::s_nCuckooInitialSize = 1024;
     size_t Map_find_string::s_nCuckooProbesetSize = 16;
@@ -98,6 +99,11 @@ namespace map {
       if (s_nSkipListMapPassCount == 0)
         s_nSkipListMapPassCount = 500;
 
+      s_nSplitListMapPassCount =
+          cfg.get_size_t("SplitListMapPassCount", s_nSplitListMapPassCount);
+      if (s_nSplitListMapPassCount == 0)
+        s_nSplitListMapPassCount = 500;
+
       s_nPercentExists = cfg.get_size_t("PercentExists", s_nPercentExists);
       if (s_nPercentExists > 100)
         s_nPercentExists = 100;

diff --git a/test/stress/sequential/sequential-map/find_string/map_find_string.h b/test/stress/sequential/sequential-map/find_string/map_find_string.h
index b6068a3b566034c2b1a5bf755a2c6fcaca042464..61eb2199610286fc9e2bcbd41c0c7621977813bb 100644 (file)
--- a/test/stress/sequential/sequential-map/find_string/map_find_string.h
+++ b/test/stress/sequential/sequential-map/find_string/map_find_string.h
@@ -44,6 +44,7 @@ namespace map {
         static size_t s_nFeldmanPassCount;
         static size_t s_nMichaelMapPassCount;
         static size_t s_nSkipListMapPassCount;
+        static size_t s_nSplitListMapPassCount;
 
         static size_t s_nMaxLoadFactor;     // maximum load factor
 
@@ -212,6 +213,13 @@ namespace map {
           run_test<Map>();
         }
 
+        template <class Map>
+        void run_split_list() {
+          Map_find_string::s_nPassCount =
+              Map_find_string::s_nSplitListMapPassCount;
+          run_test<Map>();
+        }
+
     };
 
     class Map_find_string_stdhash: public Map_find_string

diff --git a/test/stress/sequential/sequential-map/find_string/map_find_string_split.cpp b/test/stress/sequential/sequential-map/find_string/map_find_string_split.cpp
index b90be379a6b71d6d620dc3103a19b350eebbad3c..6e33e01afe6c332917dd4141185dda2e33f793be 100644 (file)
--- a/test/stress/sequential/sequential-map/find_string/map_find_string_split.cpp
+++ b/test/stress/sequential/sequential-map/find_string/map_find_string_split.cpp
@@ -33,8 +33,8 @@
 
 namespace map {
 
-    CDSSTRESS_SplitListMap(      Map_find_string_LF, run_test, std::string, Map_find_string::value_type )
-    CDSSTRESS_SplitListIterableMap( Map_find_string_LF, run_test, std::string, Map_find_string::value_type )
-    CDSSTRESS_SplitListMap_nogc( Map_find_string_LF, run_test, std::string, Map_find_string::value_type )
+    CDSSTRESS_SplitListMap(      Map_find_string_LF, run_split_list, std::string, Map_find_string::value_type )
+    CDSSTRESS_SplitListIterableMap( Map_find_string_LF, run_split_list, std::string, Map_find_string::value_type )
+    CDSSTRESS_SplitListMap_nogc( Map_find_string_LF, run_split_list, std::string, Map_find_string::value_type )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdel_string/CMakeLists.txt b/test/stress/sequential/sequential-map/insdel_string/CMakeLists.txt
index a2d7e2689e3a498f7d90c2f9dba97fc19ec92f25..726631bdfaf0776d0b7d57b9d353fb0c431caff0 100644 (file)
--- a/test/stress/sequential/sequential-map/insdel_string/CMakeLists.txt
+++ b/test/stress/sequential/sequential-map/insdel_string/CMakeLists.txt
@@ -4,14 +4,14 @@ set(CDSSTRESS_MAP_INSDEL_STRING_SOURCES
     ../../../main.cpp
     map_insdel_string.cpp
     map_insdel_string_bronsonavltree.cpp
-    map_insdel_string_cuckoo.cpp
+    #map_insdel_string_cuckoo.cpp
     map_insdel_string_ellentree.cpp
     map_insdel_string_feldman_hashset.cpp
     map_insdel_string_michael.cpp
     map_insdel_string_skip.cpp
     map_insdel_string_split.cpp
-    map_insdel_string_std.cpp
-    map_insdel_string_striped.cpp
+    #map_insdel_string_std.cpp
+    #map_insdel_string_striped.cpp
 )
 
 include_directories(

diff --git a/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.cpp b/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.cpp
index 8b55be5ddf6e1d46065740ab8459865a89458ffa..22373a99be63d24685f61d163c9e27f9e8244f7c 100644 (file)
--- a/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.cpp
+++ b/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.cpp
@@ -42,6 +42,7 @@ namespace map {
     size_t Map_InsDel_string::s_nEllenBinTreeMapPassCount = 100;
     size_t Map_InsDel_string::s_nMichaelMapPassCount = 100;
     size_t Map_InsDel_string::s_nSkipListMapPassCount = 100;
+    size_t Map_InsDel_string::s_nSplitListMapPassCount = 100;
 
     size_t Map_InsDel_string::s_nMaxLoadFactor = 8;      // maximum load factor
 
@@ -100,6 +101,11 @@ namespace map {
         if (s_nSkipListMapPassCount == 0)
           s_nSkipListMapPassCount = 500;
 
+        s_nSplitListMapPassCount =
+            cfg.get_size_t("SplitListMapPassCount", s_nSplitListMapPassCount);
+        if (s_nSplitListMapPassCount == 0)
+          s_nSplitListMapPassCount = 500;
+
         s_nMaxLoadFactor = cfg.get_size_t( "MaxLoadFactor", s_nMaxLoadFactor );
         if ( s_nMaxLoadFactor == 0 )
             s_nMaxLoadFactor = 1;

diff --git a/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.h b/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.h
index dcd6d4ffb5ea48ca4a5aa66b5c110fa894601f1b..050025a08768ef2697fd0a6112827c9c57f8cff7 100644 (file)
--- a/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.h
+++ b/test/stress/sequential/sequential-map/insdel_string/map_insdel_string.h
@@ -46,6 +46,7 @@ namespace map {
         static size_t s_nFeldmanPassCount;
         static size_t s_nMichaelMapPassCount;
         static size_t s_nSkipListMapPassCount;
+        static size_t s_nSplitListMapPassCount;
 
         static size_t s_nMaxLoadFactor;     // maximum load factor
 
@@ -224,6 +225,13 @@ namespace map {
               Map_InsDel_string::s_nSkipListMapPassCount;
           run_test<Map>();
         }
+
+        template <class Map>
+        void run_split_list() {
+          Map_InsDel_string::s_nThreadPassCount =
+              Map_InsDel_string::s_nSplitListMapPassCount;
+          run_test<Map>();
+        }
     };
 
     class Map_InsDel_string_stdhash: public Map_InsDel_string

diff --git a/test/stress/sequential/sequential-map/insdel_string/map_insdel_string_split.cpp b/test/stress/sequential/sequential-map/insdel_string/map_insdel_string_split.cpp
index 3c3a3e40f2ab0bcf1b1e1e46f9b9fcbf4403d480..16018633091bf5a7f6dbe0fc6ada12583f6a96bf 100644 (file)
--- a/test/stress/sequential/sequential-map/insdel_string/map_insdel_string_split.cpp
+++ b/test/stress/sequential/sequential-map/insdel_string/map_insdel_string_split.cpp
@@ -33,7 +33,7 @@
 
 namespace map {
 
-    CDSSTRESS_SplitListMap( Map_InsDel_string_LF, run_test, std::string, size_t )
-    CDSSTRESS_SplitListIterableMap( Map_InsDel_string_LF, run_test, std::string, size_t )
+    CDSSTRESS_SplitListMap( Map_InsDel_string_LF, run_split_list, std::string, size_t )
+    CDSSTRESS_SplitListIterableMap( Map_InsDel_string_LF, run_split_list, std::string, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-set/CMakeLists.txt b/test/stress/sequential/sequential-set/CMakeLists.txt
index 5c24b1be588b5fbd6ad9c963f6ff5b44a7430fc9..7e513db320d9a8632c1078d50c54ad2c432d64ea 100644 (file)
--- a/test/stress/sequential/sequential-set/CMakeLists.txt
+++ b/test/stress/sequential/sequential-set/CMakeLists.txt
@@ -1,21 +1,21 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCDSUNIT_USE_URCU")
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/del3)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/delodd)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/del3)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/delodd)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_find)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_func)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_string)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/iteration)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_func)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_string)
+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/iteration)
 #add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/iter_erase)
 
 add_custom_target( stress-sequential-set
     DEPENDS
-        stress-sequential-set-del3
-        stress-sequential-set-delodd
+        #stress-sequential-set-del3
+        #stress-sequential-set-delodd
         stress-sequential-set-insdelfind
-        stress-sequential-set-insdel-func
-        stress-sequential-set-insdel-string
-        stress-sequential-set-iteration
+        #stress-sequential-set-insdel-func
+        #stress-sequential-set-insdel-string
+        #stress-sequential-set-iteration
         #stress-sequential-set-iter-erase
 )

diff --git a/test/stress/sequential/sequential-set/insdel_find/CMakeLists.txt b/test/stress/sequential/sequential-set/insdel_find/CMakeLists.txt
index eb3ef457322d0116e3661fd813363d9816e49ac9..ff1285f991afaaffdbdbdb09999cb524d98675ac 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/CMakeLists.txt
+++ b/test/stress/sequential/sequential-set/insdel_find/CMakeLists.txt
@@ -43,14 +43,14 @@ add_executable(${EXE_SET_INSDELFIND_RCU} ${CDSSTRESS_SET_INSDELFIND_RCU_SOURCES}
 target_link_libraries(${EXE_SET_INSDELFIND_RCU} ${CDS_TEST_LIBRARIES} ${CDSSTRESS_FRAMEWORK_LIBRARY})
 add_test(NAME ${EXE_SET_INSDELFIND_RCU} COMMAND ${EXE_SET_INSDELFIND_RCU} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
-add_executable(${EXE_SET_INSDELFIND_LOCK} ${CDSSTRESS_SET_INSDELFIND_LOCK_SOURCES})
-target_link_libraries(${EXE_SET_INSDELFIND_LOCK} ${CDS_TEST_LIBRARIES} ${CDSSTRESS_FRAMEWORK_LIBRARY})
-add_test(NAME ${EXE_SET_INSDELFIND_LOCK} COMMAND ${EXE_SET_INSDELFIND_LOCK} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+#add_executable(${EXE_SET_INSDELFIND_LOCK} ${CDSSTRESS_SET_INSDELFIND_LOCK_SOURCES})
+#target_link_libraries(${EXE_SET_INSDELFIND_LOCK} ${CDS_TEST_LIBRARIES} ${CDSSTRESS_FRAMEWORK_LIBRARY})
+#add_test(NAME ${EXE_SET_INSDELFIND_LOCK} COMMAND ${EXE_SET_INSDELFIND_LOCK} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 add_custom_target( stress-sequential-set-insdelfind
     DEPENDS
         stress-sequential-set-insdelfind-hp
         stress-sequential-set-insdelfind-rcu
-        stress-sequential-set-insdelfind-lock
+        #stress-sequential-set-insdelfind-lock
 )
 

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.cpp
index a03a87a7f22d17c9f0eb7cca47484ccaf284b661..ec8effc2bf16c613d99f668eea6a9f3ea23b2e46 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.cpp
@@ -33,7 +33,13 @@
 namespace set {
 
     size_t Set_InsDelFind::s_nSetSize = 500000;      // initial set size
-    size_t Set_InsDelFind::s_nPassCount = 500000;      // initial pass count 
+    size_t Set_InsDelFind::s_nPassCount = 500000;      // initial pass count
+    size_t Set_InsDelFind::s_nFeldmanPassCount = 100;
+    size_t Set_InsDelFind::s_nBronsonAVLTreeMapPassCount = 100;
+    size_t Set_InsDelFind::s_nEllenBinTreeMapPassCount = 100;
+    size_t Set_InsDelFind::s_nMichaelMapPassCount = 100;
+    size_t Set_InsDelFind::s_nSkipListMapPassCount = 100;
+    size_t Set_InsDelFind::s_nSplitListMapPassCount = 100;
 
     size_t Set_InsDelFind::s_nThreadCount = 8;       // thread count
     size_t Set_InsDelFind::s_nMaxLoadFactor = 8;     // maximum load factor
@@ -53,7 +59,7 @@ namespace set {
 
     void Set_InsDelFind::SetUpTestCase()
     {
-        cds_test::config const& cfg = get_config( "sequential_map_insdelfind" );
+        cds_test::config const& cfg = get_config( "sequential_set_insdelfind" );
 
         s_nSetSize = cfg.get_size_t( "InitialMapSize", s_nSetSize );
         if ( s_nSetSize < 1000 )
@@ -63,6 +69,36 @@ namespace set {
         if ( s_nPassCount < 1000 )
             s_nPassCount = 1000;
 
+        s_nFeldmanPassCount =
+            cfg.get_size_t("FeldmanPassCount", s_nFeldmanPassCount);
+        if (s_nFeldmanPassCount == 0)
+          s_nFeldmanPassCount = 500;
+
+        s_nBronsonAVLTreeMapPassCount = cfg.get_size_t(
+            "BronsonAVLTreeMapPassCount", s_nBronsonAVLTreeMapPassCount);
+        if (s_nBronsonAVLTreeMapPassCount == 0)
+          s_nBronsonAVLTreeMapPassCount = 500;
+
+        s_nEllenBinTreeMapPassCount = cfg.get_size_t(
+            "EllenBinTreeMapPassCount", s_nEllenBinTreeMapPassCount);
+        if (s_nEllenBinTreeMapPassCount == 0)
+          s_nEllenBinTreeMapPassCount = 500;
+
+        s_nMichaelMapPassCount =
+            cfg.get_size_t("MichaelMapPassCount", s_nMichaelMapPassCount);
+        if (s_nMichaelMapPassCount == 0)
+          s_nMichaelMapPassCount = 500;
+
+        s_nSkipListMapPassCount =
+            cfg.get_size_t("SkipListMapPassCount", s_nSkipListMapPassCount);
+        if (s_nSkipListMapPassCount == 0)
+          s_nSkipListMapPassCount = 500;
+
+        s_nSplitListMapPassCount =
+            cfg.get_size_t("SplitListMapPassCount", s_nSplitListMapPassCount);
+        if (s_nSplitListMapPassCount == 0)
+          s_nSplitListMapPassCount = 500;
+
         s_nThreadCount = cfg.get_size_t( "ThreadCount", s_nThreadCount );
         if ( s_nThreadCount == 0 )
             s_nThreadCount = 2;

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.h b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.h
index ba9a8490134f7b740f885e2d649b3592d5dedd0d..1ab9284af70b7ef941156d6a8dc60e64ca7e0938 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.h
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind.h
@@ -37,6 +37,13 @@ namespace set {
     public:
         static size_t s_nSetSize;           // initial set size
         static size_t s_nPassCount;           // initial set size
+        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;
@@ -204,6 +211,34 @@ namespace set {
             Set s( *this );
             do_test( s );
         }
+
+        template <class Set>
+        void run_bronson_avl_tree() {
+          Set_InsDelFind::s_nPassCount =
+              Set_InsDelFind::s_nBronsonAVLTreeMapPassCount;
+          run_test<Set>();
+        }
+
+        template <class Set>
+        void run_ellen_bin_tree() {
+          Set_InsDelFind::s_nPassCount =
+              Set_InsDelFind::s_nEllenBinTreeMapPassCount;
+          run_test<Set>();
+        }
+
+        template <class Set>
+        void run_feldman() {
+          Set_InsDelFind::s_nPassCount =
+              Set_InsDelFind::s_nFeldmanPassCount;
+          run_test<Set>();
+        }
+
+        template <class Set>
+        void run_skip_list() {
+          Set_InsDelFind::s_nPassCount =
+              Set_InsDelFind::s_nSkipListMapPassCount;
+          run_test<Set>();
+        }
     };
 
     class Set_InsDelFind_LF: public Set_InsDelFind
@@ -218,6 +253,20 @@ namespace set {
             Set_InsDelFind::run_test<Set>();
         }
 
+        template <class Set>
+        void run_michael() {
+          Set_InsDelFind::s_nPassCount =
+              Set_InsDelFind::s_nMichaelMapPassCount;
+          Set_InsDelFind_LF::run_test<Set>();
+        }
+
+        template <class Set>
+        void run_split_list() {
+          Set_InsDelFind::s_nPassCount =
+              Set_InsDelFind::s_nSplitListMapPassCount;
+          Set_InsDelFind_LF::run_test<Set>();
+        }
+
         static std::vector<size_t> get_load_factors();
     };
 

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_hp.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_hp.cpp
index adfd5920b49f350a297a1049243f74d963134bdb..4d250c53b5da2369768d08f96027978490bc3604 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_hp.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_hp.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_EllenBinTreeSet_HP( Set_InsDelFind, run_test, size_t, size_t )
+    CDSSTRESS_EllenBinTreeSet_HP( Set_InsDelFind, run_ellen_bin_tree, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_rcu.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_rcu.cpp
index 11906ea53a9f8038a1935883b755195a35c51cf7..7ef51e1c9c2cd3c443a4fb40dcbca9ed34ed6e04 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_rcu.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_ellentree_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_EllenBinTreeSet_RCU( Set_InsDelFind, run_test, size_t, size_t )
+    CDSSTRESS_EllenBinTreeSet_RCU( Set_InsDelFind, run_ellen_bin_tree, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_hp.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_hp.cpp
index 7e6a68e301bae1b84664824572aca182105fd7d2..336a40f142db60cff86e2d4b5df12779c927405f 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_hp.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_hp.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_FeldmanHashSet_fixed_HP( Set_InsDelFind, run_test, size_t, size_t )
+    CDSSTRESS_FeldmanHashSet_fixed_HP( Set_InsDelFind, run_feldman, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_rcu.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_rcu.cpp
index 423cfddea1af2bd97775d82dbdf3d71203937ae3..6934da7839a8a005ac43adbd47d8e1d2bd5d9a1a 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_rcu.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_feldman_hashset_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_FeldmanHashSet_fixed_RCU( Set_InsDelFind, run_test, size_t, size_t )
+    CDSSTRESS_FeldmanHashSet_fixed_RCU( Set_InsDelFind, run_feldman, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_hp.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_hp.cpp
index d43ae5d19bb775fd7acad760656506a02cdffb8d..ca8b39184af37d1ef21c8d27c05698bb83c9a7d0 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_hp.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_hp.cpp
@@ -33,7 +33,7 @@
 
 namespace set {
 
-    CDSSTRESS_MichaelSet_HP( Set_InsDelFind_LF, run_test, size_t, size_t )
+    CDSSTRESS_MichaelSet_HP( Set_InsDelFind_LF, run_michael, size_t, size_t )
     CDSSTRESS_MichaelIterableSet( Set_InsDelFind_LF, run_test, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_rcu.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_rcu.cpp
index 0006b83175837882faccaed95f30a2d0dc4399ab..cdda083e6cb4467d4dbacf1b8a8512b59c4c9e49 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_rcu.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_michael_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_MichaelSet_RCU( Set_InsDelFind_LF, run_test, size_t, size_t )
+    CDSSTRESS_MichaelSet_RCU( Set_InsDelFind_LF, run_michael, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_hp.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_hp.cpp
index 539d0d9959fc8c4f6ee9d96f265eba055342b8a2..73c249abf81752e42b5ea55fab63280f0b42d606 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_hp.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_hp.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_SkipListSet_HP( Set_InsDelFind, run_test, size_t, size_t )
+    CDSSTRESS_SkipListSet_HP( Set_InsDelFind, run_skip_list, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_rcu.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_rcu.cpp
index 9ecaceb44ec84256ed7ca2d3d7f02a39320204ac..d887a79351052877edf87aa300d87c15f5eb0077 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_rcu.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_skip_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_SkipListSet_RCU( Set_InsDelFind, run_test, size_t, size_t )
+    CDSSTRESS_SkipListSet_RCU( Set_InsDelFind, run_skip_list, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_hp.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_hp.cpp
index 35a3ca6b6de9db0949d7f7824bc33ff478b37622..c83a2b8cc2c7fa8214c2025c6d09ce722a5d2652 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_hp.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_hp.cpp
@@ -33,7 +33,7 @@
 
 namespace set {
 
-    CDSSTRESS_SplitListSet_HP( Set_InsDelFind_LF, run_test, size_t, size_t )
-    CDSSTRESS_SplitListIterableSet( Set_InsDelFind_LF, run_test, size_t, size_t )
+    CDSSTRESS_SplitListSet_HP( Set_InsDelFind_LF, run_split_list, size_t, size_t )
+    CDSSTRESS_SplitListIterableSet( Set_InsDelFind_LF, run_split_list, size_t, size_t )
 
 } // namespace set

diff --git a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_rcu.cpp b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_rcu.cpp
index d0f98b7dbfaec8bee3565ccd03919a7a9d0a94fa..30e6aae2c0038b0dae3d802bb1b5ec2d4a0f352c 100644 (file)
--- a/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_rcu.cpp
+++ b/test/stress/sequential/sequential-set/insdel_find/set_insdelfind_split_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace set {
 
-    CDSSTRESS_SplitListSet_RCU( Set_InsDelFind_LF, run_test, size_t, size_t )
+    CDSSTRESS_SplitListSet_RCU( Set_InsDelFind_LF, run_split_list, size_t, size_t )
 
 } // namespace set