From 77f1ac5023c954c40ab1c9e9fdbd787cdf116c12 Mon Sep 17 00:00:00 2001 From: Peizhao Ou Date: Wed, 17 Jan 2018 14:45:58 -0800 Subject: [PATCH 1/1] Only activates insdelfind for sequential set test case --- .../sequential/sequential-map/CMakeLists.txt | 28 +++++------ .../sequential-map/find_string/CMakeLists.txt | 8 +-- .../find_string/map_find_string.cpp | 6 +++ .../find_string/map_find_string.h | 8 +++ .../find_string/map_find_string_split.cpp | 6 +-- .../insdel_string/CMakeLists.txt | 6 +-- .../insdel_string/map_insdel_string.cpp | 6 +++ .../insdel_string/map_insdel_string.h | 8 +++ .../insdel_string/map_insdel_string_split.cpp | 4 +- .../sequential/sequential-set/CMakeLists.txt | 20 ++++---- .../sequential-set/insdel_find/CMakeLists.txt | 8 +-- .../insdel_find/set_insdelfind.cpp | 40 ++++++++++++++- .../insdel_find/set_insdelfind.h | 49 +++++++++++++++++++ .../set_insdelfind_ellentree_hp.cpp | 2 +- .../set_insdelfind_ellentree_rcu.cpp | 2 +- .../set_insdelfind_feldman_hashset_hp.cpp | 2 +- .../set_insdelfind_feldman_hashset_rcu.cpp | 2 +- .../insdel_find/set_insdelfind_michael_hp.cpp | 2 +- .../set_insdelfind_michael_rcu.cpp | 2 +- .../insdel_find/set_insdelfind_skip_hp.cpp | 2 +- .../insdel_find/set_insdelfind_skip_rcu.cpp | 2 +- .../insdel_find/set_insdelfind_split_hp.cpp | 4 +- .../insdel_find/set_insdelfind_split_rcu.cpp | 2 +- 23 files changed, 166 insertions(+), 53 deletions(-) diff --git a/test/stress/sequential/sequential-map/CMakeLists.txt b/test/stress/sequential/sequential-map/CMakeLists.txt index 6cd9e103..2a1bd29a 100644 --- 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 f079ba5c..610b997a 100644 --- 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 b4c4c375..5a1a9876 100644 --- 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 b6068a3b..61eb2199 100644 --- 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(); } + template + void run_split_list() { + Map_find_string::s_nPassCount = + Map_find_string::s_nSplitListMapPassCount; + run_test(); + } + }; 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 b90be379..6e33e01a 100644 --- 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 a2d7e268..726631bd 100644 --- 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 8b55be5d..22373a99 100644 --- 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 dcd6d4ff..050025a0 100644 --- 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(); } + + template + void run_split_list() { + Map_InsDel_string::s_nThreadPassCount = + Map_InsDel_string::s_nSplitListMapPassCount; + run_test(); + } }; 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 3c3a3e40..16018633 100644 --- 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 5c24b1be..7e513db3 100644 --- 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 eb3ef457..ff1285f9 100644 --- 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 a03a87a7..ec8effc2 100644 --- 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 ba9a8490..1ab9284a 100644 --- 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 + void run_bronson_avl_tree() { + Set_InsDelFind::s_nPassCount = + Set_InsDelFind::s_nBronsonAVLTreeMapPassCount; + run_test(); + } + + template + void run_ellen_bin_tree() { + Set_InsDelFind::s_nPassCount = + Set_InsDelFind::s_nEllenBinTreeMapPassCount; + run_test(); + } + + template + void run_feldman() { + Set_InsDelFind::s_nPassCount = + Set_InsDelFind::s_nFeldmanPassCount; + run_test(); + } + + template + void run_skip_list() { + Set_InsDelFind::s_nPassCount = + Set_InsDelFind::s_nSkipListMapPassCount; + run_test(); + } }; class Set_InsDelFind_LF: public Set_InsDelFind @@ -218,6 +253,20 @@ namespace set { Set_InsDelFind::run_test(); } + template + void run_michael() { + Set_InsDelFind::s_nPassCount = + Set_InsDelFind::s_nMichaelMapPassCount; + Set_InsDelFind_LF::run_test(); + } + + template + void run_split_list() { + Set_InsDelFind::s_nPassCount = + Set_InsDelFind::s_nSplitListMapPassCount; + Set_InsDelFind_LF::run_test(); + } + static std::vector 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 adfd5920..4d250c53 100644 --- 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 11906ea5..7ef51e1c 100644 --- 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 7e6a68e3..336a40f1 100644 --- 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 423cfdde..6934da78 100644 --- 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 d43ae5d1..ca8b3918 100644 --- 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 0006b831..cdda083e 100644 --- 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 539d0d99..73c249ab 100644 --- 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 9ecaceb4..d887a793 100644 --- 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 35a3ca6b..c83a2b8c 100644 --- 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 d0f98b7d..30e6aae2 100644 --- 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 -- 2.34.1