From: khizmax Date: Wed, 22 Oct 2014 06:00:56 +0000 (+0400) Subject: remove michael_list_hrc.h X-Git-Tag: v2.0.0~186 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=5db878ef0aabb79e66a7a90df74edc115d5d35dc remove michael_list_hrc.h --- diff --git a/cds/container/michael_kvlist_hrc.h b/cds/container/michael_kvlist_hrc.h deleted file mode 100644 index 8d0e4a1f..00000000 --- a/cds/container/michael_kvlist_hrc.h +++ /dev/null @@ -1,11 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_CONTAINER_MICHAEL_KVLIST_HRC_H -#define __CDS_CONTAINER_MICHAEL_KVLIST_HRC_H - -#include -#include -#include -#include - -#endif // #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_HRC_H diff --git a/cds/container/michael_list_hrc.h b/cds/container/michael_list_hrc.h deleted file mode 100644 index ce9b1f54..00000000 --- a/cds/container/michael_list_hrc.h +++ /dev/null @@ -1,11 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_CONTAINER_MICHAEL_LIST_HRC_H -#define __CDS_CONTAINER_MICHAEL_LIST_HRC_H - -#include -#include -#include -#include - -#endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_HRC_H diff --git a/cds/intrusive/impl/michael_list.h b/cds/intrusive/impl/michael_list.h index 20d52466..7bc965e0 100644 --- a/cds/intrusive/impl/michael_list.h +++ b/cds/intrusive/impl/michael_list.h @@ -90,7 +90,6 @@ namespace cds { namespace intrusive { You should select GC needed and include appropriate .h-file: - for gc::HP: \code #include \endcode - for gc::DHP: \code #include \endcode - - for gc::HRC: \code #include \endcode - for \ref cds_urcu_gc "RCU type" - see \ref cds_intrusive_MichaelList_rcu "RCU-based MichaelList" - for gc::nogc: \code #include \endcode See \ref cds_intrusive_MichaelList_nogc "non-GC MichaelList" diff --git a/cds/intrusive/michael_list_hrc.h b/cds/intrusive/michael_list_hrc.h deleted file mode 100644 index 29e449d5..00000000 --- a/cds/intrusive/michael_list_hrc.h +++ /dev/null @@ -1,76 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_INTRUSIVE_MICHAEL_LIST_HRC_H -#define __CDS_INTRUSIVE_MICHAEL_LIST_HRC_H - -#include -#include - -namespace cds { namespace intrusive { namespace michael_list { - //@cond - // Specialization for HRC GC - template - struct node< gc::HRC, Tag>: public gc::HRC::container_node - { - typedef gc::HRC gc ; ///< Garbage collector - typedef Tag tag ; ///< tag - - typedef cds::details::marked_ptr marked_ptr ; ///< marked pointer - typedef typename gc::atomic_marked_ptr< marked_ptr> atomic_marked_ptr ; ///< atomic marked pointer - atomic_marked_ptr m_pNext ; ///< pointer to the next node in the stack - - node() - : m_pNext( nullptr ) - {} - - protected: - virtual void cleanUp( cds::gc::hrc::ThreadGC * pGC ) - { - assert( pGC ); - typename gc::GuardArray<2> aGuards( *pGC ); - - while ( true ) { - marked_ptr pNextMarked( aGuards.protect( 0, m_pNext )); - node * pNext = pNextMarked.ptr(); - if ( pNext && pNext->m_bDeleted.load(atomics::memory_order_acquire) ) { - marked_ptr p = aGuards.protect( 1, pNext->m_pNext ); - m_pNext.compare_exchange_strong( pNextMarked, p, atomics::memory_order_acquire, atomics::memory_order_relaxed ); - continue; - } - else { - break; - } - } - } - - virtual void terminate( cds::gc::hrc::ThreadGC * pGC, bool bConcurrent ) - { - if ( bConcurrent ) { - marked_ptr pNext = m_pNext.load(atomics::memory_order_acquire); - do {} while ( !m_pNext.compare_exchange_weak( pNext, marked_ptr(), atomics::memory_order_release, atomics::memory_order_relaxed ) ); - } - else { - m_pNext.store( marked_ptr(), atomics::memory_order_relaxed ); - } - } - }; - //@endcond - - - //@cond - template - struct link_checker_selector< gc::HRC, NODE, opt::never_check_link > - { - typedef link_checker type; - }; - - template - struct link_checker_selector< gc::HRC, NODE, opt::debug_check_link > - { - typedef link_checker type; - }; - //@endcond - -}}} // namespace cds::intrusive::michael_list - -#endif // #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_HP_H diff --git a/projects/Win/vc12/cds.sln b/projects/Win/vc12/cds.sln index 33eba274..947633d0 100644 --- a/projects/Win/vc12/cds.sln +++ b/projects/Win/vc12/cds.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31010.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "cds.vcxproj", "{408FE9BC-44F0-4E6A-89FA-D6F952584239}" EndProject @@ -67,6 +67,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdr-test-ordered-list", "hd EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "map", "map", "{6BB7A27F-FC59-4267-B6FA-D034176D1459}" ProjectSection(SolutionItems) = preProject + ..\..\..\tests\unit\map2\map_defs.h = ..\..\..\tests\unit\map2\map_defs.h ..\..\..\tests\unit\map2\map_types.h = ..\..\..\tests\unit\map2\map_types.h ..\..\..\tests\unit\map2\std_hash_map.h = ..\..\..\tests\unit\map2\std_hash_map.h ..\..\..\tests\unit\map2\std_hash_map_gcc.h = ..\..\..\tests\unit\map2\std_hash_map_gcc.h diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index 5ef0fedf..65e5a9d4 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -936,7 +936,6 @@ - @@ -962,10 +961,8 @@ - - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 65c5e3f5..f2a148d0 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -554,9 +554,6 @@ Header Files\cds\intrusive - - Header Files\cds\intrusive - Header Files\cds\intrusive @@ -632,18 +629,12 @@ Header Files\cds\container - - Header Files\cds\container - Header Files\cds\container Header Files\cds\container - - Header Files\cds\container - Header Files\cds\container diff --git a/projects/Win/vc12/hdr-test-map.vcxproj b/projects/Win/vc12/hdr-test-map.vcxproj index 104dac46..105cd735 100644 --- a/projects/Win/vc12/hdr-test-map.vcxproj +++ b/projects/Win/vc12/hdr-test-map.vcxproj @@ -545,7 +545,6 @@ - @@ -581,7 +580,6 @@ - diff --git a/projects/Win/vc12/hdr-test-map.vcxproj.filters b/projects/Win/vc12/hdr-test-map.vcxproj.filters index beb743c4..8a6d7865 100644 --- a/projects/Win/vc12/hdr-test-map.vcxproj.filters +++ b/projects/Win/vc12/hdr-test-map.vcxproj.filters @@ -7,9 +7,6 @@ michael - - michael - michael @@ -67,9 +64,6 @@ split_list - - split_list - split_list diff --git a/projects/Win/vc12/hdr-test-ordered-list.vcxproj b/projects/Win/vc12/hdr-test-ordered-list.vcxproj index a4f65c73..42bf92e8 100644 --- a/projects/Win/vc12/hdr-test-ordered-list.vcxproj +++ b/projects/Win/vc12/hdr-test-ordered-list.vcxproj @@ -553,7 +553,6 @@ - @@ -580,9 +579,7 @@ - - diff --git a/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters b/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters index f7f64938..769b3aa0 100644 --- a/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters +++ b/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters @@ -25,9 +25,6 @@ intrusive - - intrusive - intrusive @@ -79,15 +76,9 @@ container - - container - container - - container - container diff --git a/projects/Win/vc12/hdr-test-set.vcxproj b/projects/Win/vc12/hdr-test-set.vcxproj index 79138f6e..bfc14b82 100644 --- a/projects/Win/vc12/hdr-test-set.vcxproj +++ b/projects/Win/vc12/hdr-test-set.vcxproj @@ -545,7 +545,6 @@ - @@ -580,7 +579,6 @@ - @@ -597,7 +595,6 @@ - @@ -624,7 +621,6 @@ - diff --git a/projects/Win/vc12/hdr-test-set.vcxproj.filters b/projects/Win/vc12/hdr-test-set.vcxproj.filters index d0129f67..aa330c2f 100644 --- a/projects/Win/vc12/hdr-test-set.vcxproj.filters +++ b/projects/Win/vc12/hdr-test-set.vcxproj.filters @@ -53,9 +53,6 @@ intrusive\michael_set - - intrusive\michael_set - intrusive\michael_set @@ -110,9 +107,6 @@ intrusive\split_list - - intrusive\split_list - intrusive\split_list @@ -149,9 +143,6 @@ container\michael_set - - container\michael_set - container\michael_set @@ -200,9 +191,6 @@ container\split_list - - container\split_list - container\split_list diff --git a/projects/source.test-hdr.mk b/projects/source.test-hdr.mk index 89e838c5..05830ba4 100644 --- a/projects/source.test-hdr.mk +++ b/projects/source.test-hdr.mk @@ -1,6 +1,5 @@ CDS_TESTHDR_MAP := \ tests/test-hdr/map/hdr_michael_map_hp.cpp \ - tests/test-hdr/map/hdr_michael_map_hrc.cpp \ tests/test-hdr/map/hdr_michael_map_ptb.cpp \ tests/test-hdr/map/hdr_michael_map_rcu_gpi.cpp \ tests/test-hdr/map/hdr_michael_map_rcu_gpb.cpp \ @@ -35,7 +34,6 @@ CDS_TESTHDR_MAP := \ tests/test-hdr/map/hdr_skiplist_map_rcu_sht.cpp \ tests/test-hdr/map/hdr_skiplist_map_nogc.cpp \ tests/test-hdr/map/hdr_splitlist_map_hp.cpp \ - tests/test-hdr/map/hdr_splitlist_map_hrc.cpp \ tests/test-hdr/map/hdr_splitlist_map_ptb.cpp \ tests/test-hdr/map/hdr_splitlist_map_nogc.cpp \ tests/test-hdr/map/hdr_splitlist_map_rcu_gpi.cpp \ @@ -85,9 +83,7 @@ CDS_TESTHDR_ORDLIST := \ tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_gpt.cpp \ tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_shb.cpp \ tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_sht.cpp \ - tests/test-hdr/ordered_list/hdr_intrusive_michael_hrc.cpp \ tests/test-hdr/ordered_list/hdr_michael_hp.cpp \ - tests/test-hdr/ordered_list/hdr_michael_hrc.cpp \ tests/test-hdr/ordered_list/hdr_michael_nogc.cpp \ tests/test-hdr/ordered_list/hdr_michael_ptb.cpp \ tests/test-hdr/ordered_list/hdr_michael_rcu_gpi.cpp \ @@ -96,7 +92,6 @@ CDS_TESTHDR_ORDLIST := \ tests/test-hdr/ordered_list/hdr_michael_rcu_shb.cpp \ tests/test-hdr/ordered_list/hdr_michael_rcu_sht.cpp \ tests/test-hdr/ordered_list/hdr_michael_kv_hp.cpp \ - tests/test-hdr/ordered_list/hdr_michael_kv_hrc.cpp \ tests/test-hdr/ordered_list/hdr_michael_kv_nogc.cpp \ tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp \ tests/test-hdr/ordered_list/hdr_michael_kv_rcu_gpi.cpp \ @@ -138,7 +133,6 @@ CDS_TESTHDR_QUEUE := \ tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp CDS_TESTHDR_SET := \ - tests/test-hdr/set/hdr_intrusive_michael_set_hrc.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_hrc_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_refinable_hashset_avlset.cpp \ tests/test-hdr/set/hdr_intrusive_refinable_hashset_list.cpp \ @@ -157,7 +151,6 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_shb.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_sht.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_nogc.cpp \ - tests/test-hdr/set/hdr_intrusive_splitlist_set_hrc.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_hrc_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_striped_hashset_avlset.cpp \ tests/test-hdr/set/hdr_intrusive_striped_hashset_list.cpp \ @@ -169,7 +162,6 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_intrusive_striped_hashset_uset.cpp \ tests/test-hdr/set/hdr_intrusive_striped_set.cpp \ tests/test-hdr/set/hdr_michael_set_hp.cpp \ - tests/test-hdr/set/hdr_michael_set_hrc.cpp \ tests/test-hdr/set/hdr_michael_set_ptb.cpp \ tests/test-hdr/set/hdr_michael_set_rcu_gpi.cpp \ tests/test-hdr/set/hdr_michael_set_rcu_gpb.cpp \ @@ -207,7 +199,6 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_skiplist_set_rcu_sht.cpp \ tests/test-hdr/set/hdr_skiplist_set_nogc.cpp \ tests/test-hdr/set/hdr_splitlist_set_hp.cpp \ - tests/test-hdr/set/hdr_splitlist_set_hrc.cpp \ tests/test-hdr/set/hdr_splitlist_set_nogc.cpp \ tests/test-hdr/set/hdr_splitlist_set_ptb.cpp \ tests/test-hdr/set/hdr_splitlist_set_rcu_gpi.cpp \ diff --git a/tests/test-hdr/map/hdr_map.h b/tests/test-hdr/map/hdr_map.h index e54ac4ed..10b196aa 100644 --- a/tests/test-hdr/map/hdr_map.h +++ b/tests/test-hdr/map/hdr_map.h @@ -636,10 +636,6 @@ namespace map { void Michael_PTB_less(); void Michael_PTB_cmpmix(); - void Michael_HRC_cmp(); - void Michael_HRC_less(); - void Michael_HRC_cmpmix(); - void Michael_RCU_GPI_cmp(); void Michael_RCU_GPI_less(); void Michael_RCU_GPI_cmpmix(); @@ -708,10 +704,6 @@ namespace map { void Split_PTB_less(); void Split_PTB_cmpmix(); - void Split_HRC_cmp(); - void Split_HRC_less(); - void Split_HRC_cmpmix(); - void Split_RCU_GPI_cmp(); void Split_RCU_GPI_less(); void Split_RCU_GPI_cmpmix(); @@ -781,10 +773,6 @@ namespace map { CPPUNIT_TEST(Michael_PTB_less) CPPUNIT_TEST(Michael_PTB_cmpmix) - CPPUNIT_TEST(Michael_HRC_cmp) - CPPUNIT_TEST(Michael_HRC_less) - CPPUNIT_TEST(Michael_HRC_cmpmix) - CPPUNIT_TEST(Michael_RCU_GPI_cmp) CPPUNIT_TEST(Michael_RCU_GPI_less) CPPUNIT_TEST(Michael_RCU_GPI_cmpmix) @@ -853,10 +841,6 @@ namespace map { CPPUNIT_TEST(Split_PTB_less) CPPUNIT_TEST(Split_PTB_cmpmix) - CPPUNIT_TEST(Split_HRC_cmp) - CPPUNIT_TEST(Split_HRC_less) - CPPUNIT_TEST(Split_HRC_cmpmix) - CPPUNIT_TEST(Split_RCU_GPI_cmp) CPPUNIT_TEST(Split_RCU_GPI_less) CPPUNIT_TEST(Split_RCU_GPI_cmpmix) diff --git a/tests/test-hdr/map/hdr_michael_map_hrc.cpp b/tests/test-hdr/map/hdr_michael_map_hrc.cpp deleted file mode 100644 index f81bc96a..00000000 --- a/tests/test-hdr/map/hdr_michael_map_hrc.cpp +++ /dev/null @@ -1,87 +0,0 @@ -//$$CDS-header$$ - -#include "map/hdr_map.h" -#include -#include - -namespace map { - namespace { - struct map_traits: public cc::michael_map::type_traits - { - typedef HashMapHdrTest::hash_int hash; - typedef HashMapHdrTest::simple_item_counter item_counter; - }; - struct HRC_cmp_traits: public cc::michael_list::type_traits - { - typedef HashMapHdrTest::cmp compare; - }; - - struct HRC_less_traits: public cc::michael_list::type_traits - { - typedef HashMapHdrTest::less less; - }; - - struct HRC_cmpmix_traits: public cc::michael_list::type_traits - { - typedef HashMapHdrTest::cmp compare; - typedef HashMapHdrTest::less less; - }; - } - - void HashMapHdrTest::Michael_HRC_cmp() - { - typedef cc::MichaelKVList< cds::gc::HRC, int, HashMapHdrTest::value_type, HRC_cmp_traits > list; - - // traits-based version - typedef cc::MichaelHashMap< cds::gc::HRC, list, map_traits > map; - test_int< map >(); - - // option-based version - typedef cc::MichaelHashMap< cds::gc::HRC, list, - cc::michael_map::make_traits< - cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - >::type - > opt_map; - test_int< opt_map >(); - } - - void HashMapHdrTest::Michael_HRC_less() - { - typedef cc::MichaelKVList< cds::gc::HRC, int, HashMapHdrTest::value_type, HRC_less_traits > list; - - // traits-based version - typedef cc::MichaelHashMap< cds::gc::HRC, list, map_traits > map; - test_int< map >(); - - // option-based version - typedef cc::MichaelHashMap< cds::gc::HRC, list, - cc::michael_map::make_traits< - cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - >::type - > opt_map; - test_int< opt_map >(); - } - - void HashMapHdrTest::Michael_HRC_cmpmix() - { - typedef cc::MichaelKVList< cds::gc::HRC, int, HashMapHdrTest::value_type, HRC_cmpmix_traits > list; - - // traits-based version - typedef cc::MichaelHashMap< cds::gc::HRC, list, map_traits > map; - test_int< map >(); - - // option-based version - typedef cc::MichaelHashMap< cds::gc::HRC, list, - cc::michael_map::make_traits< - cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - >::type - > opt_map; - test_int< opt_map >(); - } - - -} // namespace map - diff --git a/tests/test-hdr/map/hdr_splitlist_map_hrc.cpp b/tests/test-hdr/map/hdr_splitlist_map_hrc.cpp deleted file mode 100644 index 066dde76..00000000 --- a/tests/test-hdr/map/hdr_splitlist_map_hrc.cpp +++ /dev/null @@ -1,131 +0,0 @@ -//$$CDS-header$$ - -#include "map/hdr_map.h" -#include -#include - -namespace map { - - namespace { - struct HRC_cmp_traits: public cc::split_list::type_traits - { - typedef cc::michael_list_tag ordered_list; - typedef HashMapHdrTest::hash_int hash; - typedef HashMapHdrTest::simple_item_counter item_counter; - typedef cc::opt::v::relaxed_ordering memory_model; - enum { dynamic_bucket_table = false }; - - struct ordered_list_traits: public cc::michael_list::type_traits - { - typedef HashMapHdrTest::cmp compare; - }; - }; - - struct HRC_less_traits: public cc::split_list::type_traits - { - typedef cc::michael_list_tag ordered_list; - typedef HashMapHdrTest::hash_int hash; - typedef HashMapHdrTest::simple_item_counter item_counter; - typedef cc::opt::v::sequential_consistent memory_model; - enum { dynamic_bucket_table = false }; - - struct ordered_list_traits: public cc::michael_list::type_traits - { - typedef HashMapHdrTest::less less; - }; - }; - - struct HRC_cmpmix_traits: public cc::split_list::type_traits - { - typedef cc::michael_list_tag ordered_list; - typedef HashMapHdrTest::hash_int hash; - typedef HashMapHdrTest::simple_item_counter item_counter; - - struct ordered_list_traits: public cc::michael_list::type_traits - { - typedef HashMapHdrTest::cmp compare; - typedef std::less less; - }; - }; - } - - void HashMapHdrTest::Split_HRC_cmp() - { - // traits-based version - typedef cc::SplitListMap< cds::gc::HRC, key_type, value_type, HRC_cmp_traits > map_type; - test_int< map_type >(); - - // option-based version - typedef cc::SplitListMap< cds::gc::HRC, - key_type, - value_type, - cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - ,cc::opt::memory_model< cc::opt::v::relaxed_ordering > - ,cc::split_list::dynamic_bucket_table< true > - ,cc::split_list::ordered_list_traits< - cc::michael_list::make_traits< - cc::opt::compare< cmp > - >::type - > - >::type - > opt_map; - test_int< opt_map >(); - } - - void HashMapHdrTest::Split_HRC_less() - { - // traits-based version - typedef cc::SplitListMap< cds::gc::HRC, key_type, value_type, HRC_less_traits > map_type; - test_int< map_type >(); - - // option-based version - typedef cc::SplitListMap< cds::gc::HRC, - key_type, - value_type, - cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - ,cc::opt::memory_model< cc::opt::v::relaxed_ordering > - ,cc::split_list::dynamic_bucket_table< false > - ,cc::split_list::ordered_list_traits< - cc::michael_list::make_traits< - cc::opt::less< less > - >::type - > - >::type - > opt_map; - test_int< opt_map >(); - } - - void HashMapHdrTest::Split_HRC_cmpmix() - { - // traits-based version - typedef cc::SplitListMap< cds::gc::HRC, key_type, value_type, HRC_cmpmix_traits > map_type; - test_int< map_type >(); - - // option-based version - typedef cc::SplitListMap< cds::gc::HRC, - key_type, - value_type, - cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - ,cc::split_list::ordered_list_traits< - cc::michael_list::make_traits< - cc::opt::less< std::less > - ,cc::opt::compare< cmp > - >::type - > - >::type - > opt_map; - test_int< opt_map >(); - } - - -} // namespace map - diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael.h b/tests/test-hdr/ordered_list/hdr_intrusive_michael.h index e30e91bc..699beb01 100644 --- a/tests/test-hdr/ordered_list/hdr_intrusive_michael.h +++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael.h @@ -762,11 +762,6 @@ namespace ordlist { void PTB_member_cmpmix(); void PTB_member_ic(); - void HRC_base_cmp(); - void HRC_base_less(); - void HRC_base_cmpmix(); - void HRC_base_ic(); - void RCU_GPI_base_cmp(); void RCU_GPI_base_less(); void RCU_GPI_base_cmpmix(); @@ -841,11 +836,6 @@ namespace ordlist { CPPUNIT_TEST(PTB_member_cmpmix) CPPUNIT_TEST(PTB_member_ic) - CPPUNIT_TEST(HRC_base_cmp) - CPPUNIT_TEST(HRC_base_less) - CPPUNIT_TEST(HRC_base_cmpmix) - CPPUNIT_TEST(HRC_base_ic) - CPPUNIT_TEST(RCU_GPI_base_cmp) CPPUNIT_TEST(RCU_GPI_base_less) CPPUNIT_TEST(RCU_GPI_base_cmpmix) diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_hrc.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_hrc.cpp deleted file mode 100644 index 5e0d5da7..00000000 --- a/tests/test-hdr/ordered_list/hdr_intrusive_michael_hrc.cpp +++ /dev/null @@ -1,64 +0,0 @@ -//$$CDS-header$$ - -#include "ordered_list/hdr_intrusive_michael.h" -#include - -namespace ordlist { - - void IntrusiveMichaelListHeaderTest::HRC_base_cmp() - { - typedef base_int_item< cds::gc::HRC > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::HRC_base_less() - { - typedef base_int_item< cds::gc::HRC > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::HRC_base_cmpmix() - { - typedef base_int_item< cds::gc::HRC > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::HRC_base_ic() - { - typedef base_int_item< cds::gc::HRC > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > list; - test_int(); - } - -} diff --git a/tests/test-hdr/ordered_list/hdr_michael.h b/tests/test-hdr/ordered_list/hdr_michael.h index 380ae236..b7954622 100644 --- a/tests/test-hdr/ordered_list/hdr_michael.h +++ b/tests/test-hdr/ordered_list/hdr_michael.h @@ -684,11 +684,6 @@ namespace ordlist { void PTB_cmpmix(); void PTB_ic(); - void HRC_cmp(); - void HRC_less(); - void HRC_cmpmix(); - void HRC_ic(); - void RCU_GPI_cmp(); void RCU_GPI_less(); void RCU_GPI_cmpmix(); @@ -730,11 +725,6 @@ namespace ordlist { CPPUNIT_TEST(PTB_cmpmix) CPPUNIT_TEST(PTB_ic) - CPPUNIT_TEST(HRC_cmp) - CPPUNIT_TEST(HRC_less) - CPPUNIT_TEST(HRC_cmpmix) - CPPUNIT_TEST(HRC_ic) - CPPUNIT_TEST(RCU_GPI_cmp) CPPUNIT_TEST(RCU_GPI_less) CPPUNIT_TEST(RCU_GPI_cmpmix) diff --git a/tests/test-hdr/ordered_list/hdr_michael_hrc.cpp b/tests/test-hdr/ordered_list/hdr_michael_hrc.cpp deleted file mode 100644 index be1bfdf1..00000000 --- a/tests/test-hdr/ordered_list/hdr_michael_hrc.cpp +++ /dev/null @@ -1,100 +0,0 @@ -//$$CDS-header$$ - -#include "ordered_list/hdr_michael.h" -#include - -namespace ordlist { - namespace { - struct HRC_cmp_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::cmp compare; - }; - } - void MichaelListTestHeader::HRC_cmp() - { - // traits-based version - typedef cc::MichaelList< cds::gc::HRC, item, HRC_cmp_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::HRC, item, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct HRC_less_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::lt less; - }; - } - void MichaelListTestHeader::HRC_less() - { - // traits-based version - typedef cc::MichaelList< cds::gc::HRC, item, HRC_less_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::HRC, item, - cc::michael_list::make_traits< - cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct HRC_cmpmix_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::cmp compare; - typedef MichaelListTestHeader::lt less; - }; - } - void MichaelListTestHeader::HRC_cmpmix() - { - // traits-based version - typedef cc::MichaelList< cds::gc::HRC, item, HRC_cmpmix_traits> list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::HRC, item, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - ,cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct HRC_ic_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::lt less; - typedef cds::atomicity::item_counter item_counter; - }; - } - void MichaelListTestHeader::HRC_ic() - { - // traits-based version - typedef cc::MichaelList< cds::gc::HRC, item, HRC_ic_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::HRC, item, - cc::michael_list::make_traits< - cc::opt::less< lt > - ,cc::opt::item_counter< cds::atomicity::item_counter > - >::type - > opt_list; - test< opt_list >(); - } - -} // namespace ordlist - diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv.h b/tests/test-hdr/ordered_list/hdr_michael_kv.h index 7aaa8c61..b42ee6b2 100644 --- a/tests/test-hdr/ordered_list/hdr_michael_kv.h +++ b/tests/test-hdr/ordered_list/hdr_michael_kv.h @@ -607,11 +607,6 @@ namespace ordlist { void PTB_cmpmix(); void PTB_ic(); - void HRC_cmp(); - void HRC_less(); - void HRC_cmpmix(); - void HRC_ic(); - void RCU_GPI_cmp(); void RCU_GPI_less(); void RCU_GPI_cmpmix(); @@ -653,11 +648,6 @@ namespace ordlist { CPPUNIT_TEST(PTB_cmpmix) CPPUNIT_TEST(PTB_ic) - CPPUNIT_TEST(HRC_cmp) - CPPUNIT_TEST(HRC_less) - CPPUNIT_TEST(HRC_cmpmix) - CPPUNIT_TEST(HRC_ic) - CPPUNIT_TEST(RCU_GPI_cmp) CPPUNIT_TEST(RCU_GPI_less) CPPUNIT_TEST(RCU_GPI_cmpmix) diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv_hrc.cpp b/tests/test-hdr/ordered_list/hdr_michael_kv_hrc.cpp deleted file mode 100644 index d59d80a7..00000000 --- a/tests/test-hdr/ordered_list/hdr_michael_kv_hrc.cpp +++ /dev/null @@ -1,100 +0,0 @@ -//$$CDS-header$$ - -#include "ordered_list/hdr_michael_kv.h" -#include - -namespace ordlist { - namespace { - struct HRC_cmp_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::cmp compare; - }; - } - void MichaelKVListTestHeader::HRC_cmp() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, HRC_cmp_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct HRC_less_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::lt less; - }; - } - void MichaelKVListTestHeader::HRC_less() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, HRC_less_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct HRC_cmpmix_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::cmp compare; - typedef MichaelKVListTestHeader::lt less; - }; - } - void MichaelKVListTestHeader::HRC_cmpmix() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, HRC_cmpmix_traits> list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - ,cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct HRC_ic_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::lt less; - typedef cds::atomicity::item_counter item_counter; - }; - } - void MichaelKVListTestHeader::HRC_ic() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, HRC_ic_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::HRC, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::less< lt > - ,cc::opt::item_counter< cds::atomicity::item_counter > - >::type - > opt_list; - test< opt_list >(); - } - -} // namespace ordlist - diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_hrc.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_hrc.cpp deleted file mode 100644 index d1644974..00000000 --- a/tests/test-hdr/set/hdr_intrusive_michael_set_hrc.cpp +++ /dev/null @@ -1,74 +0,0 @@ -//$$CDS-header$$ - -#include "set/hdr_intrusive_set.h" -#include -#include - -namespace set { - - void IntrusiveHashSetHdrTest::HRC_base_cmp() - { - typedef base_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > bucket_type; - - typedef ci::MichaelHashSet< cds::gc::HRC, bucket_type, - ci::michael_set::make_traits< - co::hash< hash_int > - >::type - > set; - - test_int(); - } - - void IntrusiveHashSetHdrTest::HRC_base_less() - { - typedef base_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,ci::opt::disposer< faked_disposer > - >::type - > bucket_type; - - typedef ci::MichaelHashSet< cds::gc::HRC, bucket_type, - ci::michael_set::make_traits< - co::hash< hash_int > - >::type - > set; - - test_int(); - } - - void IntrusiveHashSetHdrTest::HRC_base_cmpmix() - { - typedef base_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > bucket_type; - - typedef ci::MichaelHashSet< cds::gc::HRC, bucket_type, - ci::michael_set::make_traits< - co::hash< hash_int > - ,co::item_counter< simple_item_counter > - >::type - > set; - - test_int(); - } - -} // namespace set diff --git a/tests/test-hdr/set/hdr_intrusive_set.h b/tests/test-hdr/set/hdr_intrusive_set.h index d383d861..33d3d63f 100644 --- a/tests/test-hdr/set/hdr_intrusive_set.h +++ b/tests/test-hdr/set/hdr_intrusive_set.h @@ -1065,10 +1065,6 @@ namespace set { void PTB_member_less(); void PTB_member_cmpmix(); - void HRC_base_cmp(); - void HRC_base_less(); - void HRC_base_cmpmix(); - void RCU_GPI_base_cmp(); void RCU_GPI_base_less(); void RCU_GPI_base_cmpmix(); @@ -1199,13 +1195,6 @@ namespace set { void split_st_PTB_member_less(); void split_st_PTB_member_cmpmix(); - void split_dyn_HRC_base_cmp(); - void split_dyn_HRC_base_less(); - void split_dyn_HRC_base_cmpmix(); - void split_st_HRC_base_cmp(); - void split_st_HRC_base_less(); - void split_st_HRC_base_cmpmix(); - void split_dyn_RCU_GPI_base_cmp(); void split_dyn_RCU_GPI_base_less(); void split_dyn_RCU_GPI_base_cmpmix(); @@ -1412,10 +1401,6 @@ namespace set { CPPUNIT_TEST(PTB_member_less) CPPUNIT_TEST(PTB_member_cmpmix) - CPPUNIT_TEST(HRC_base_cmp) - CPPUNIT_TEST(HRC_base_less) - CPPUNIT_TEST(HRC_base_cmpmix) - CPPUNIT_TEST(RCU_GPI_base_cmp) CPPUNIT_TEST(RCU_GPI_base_less) CPPUNIT_TEST(RCU_GPI_base_cmpmix) @@ -1544,13 +1529,6 @@ namespace set { CPPUNIT_TEST(split_st_PTB_member_less) CPPUNIT_TEST(split_st_PTB_member_cmpmix) - CPPUNIT_TEST(split_dyn_HRC_base_cmp) - CPPUNIT_TEST(split_dyn_HRC_base_less) - CPPUNIT_TEST(split_dyn_HRC_base_cmpmix) - CPPUNIT_TEST(split_st_HRC_base_cmp) - CPPUNIT_TEST(split_st_HRC_base_less) - CPPUNIT_TEST(split_st_HRC_base_cmpmix) - CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmp) CPPUNIT_TEST(split_dyn_RCU_GPI_base_less) CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmpmix) diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_hrc.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_hrc.cpp deleted file mode 100644 index f02b1699..00000000 --- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_hrc.cpp +++ /dev/null @@ -1,155 +0,0 @@ -//$$CDS-header$$ - -#include "set/hdr_intrusive_set.h" -#include -#include - -namespace set { - - void IntrusiveHashSetHdrTest::split_dyn_HRC_base_cmp() - { - typedef base_int_item< ci::split_list::node< ci::michael_list::node > > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > ord_list; - - typedef ci::SplitListSet< cds::gc::HRC, ord_list, - ci::split_list::make_traits< - co::hash< hash_int > - ,ci::split_list::dynamic_bucket_table - ,co::memory_model - >::type - > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); - - test_int(); - } - - void IntrusiveHashSetHdrTest::split_dyn_HRC_base_less() - { - typedef base_int_item< ci::split_list::node< ci::michael_list::node > > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,ci::opt::disposer< faked_disposer > - >::type - > ord_list; - - typedef ci::SplitListSet< cds::gc::HRC, ord_list, - ci::split_list::make_traits< - co::hash< hash_int > - ,co::memory_model - >::type - > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); - - test_int(); - } - - void IntrusiveHashSetHdrTest::split_dyn_HRC_base_cmpmix() - { - typedef base_int_item< ci::split_list::node > > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > ord_list; - - typedef ci::SplitListSet< cds::gc::HRC, ord_list, - ci::split_list::make_traits< - co::hash< hash_int > - ,co::item_counter< simple_item_counter > - ,ci::split_list::dynamic_bucket_table - >::type - > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); - - test_int(); - } - - // Static bucket table - void IntrusiveHashSetHdrTest::split_st_HRC_base_cmp() - { - typedef base_int_item< ci::split_list::node< ci::michael_list::node > > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > ord_list; - - typedef ci::SplitListSet< cds::gc::HRC, ord_list, - ci::split_list::make_traits< - co::hash< hash_int > - ,ci::split_list::dynamic_bucket_table - ,co::memory_model - >::type - > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); - - test_int(); - } - - void IntrusiveHashSetHdrTest::split_st_HRC_base_less() - { - typedef base_int_item< ci::split_list::node< ci::michael_list::node > > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,ci::opt::disposer< faked_disposer > - >::type - > ord_list; - - typedef ci::SplitListSet< cds::gc::HRC, ord_list, - ci::split_list::make_traits< - co::hash< hash_int > - ,ci::split_list::dynamic_bucket_table - ,co::memory_model - >::type - > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); - - test_int(); - } - - void IntrusiveHashSetHdrTest::split_st_HRC_base_cmpmix() - { - typedef base_int_item< ci::split_list::node > > item; - typedef ci::MichaelList< cds::gc::HRC - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > ord_list; - - typedef ci::SplitListSet< cds::gc::HRC, ord_list, - ci::split_list::make_traits< - co::hash< hash_int > - ,co::item_counter< simple_item_counter > - ,ci::split_list::dynamic_bucket_table - >::type - > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); - - test_int(); - } - -} // namespace set diff --git a/tests/test-hdr/set/hdr_michael_set_hrc.cpp b/tests/test-hdr/set/hdr_michael_set_hrc.cpp deleted file mode 100644 index 4a52c0f1..00000000 --- a/tests/test-hdr/set/hdr_michael_set_hrc.cpp +++ /dev/null @@ -1,88 +0,0 @@ -//$$CDS-header$$ - -#include "set/hdr_set.h" -#include -#include - -namespace set { - - namespace { - struct set_traits: public cc::michael_set::type_traits - { - typedef HashSetHdrTest::hash_int hash; - typedef HashSetHdrTest::simple_item_counter item_counter; - }; - - struct HRC_cmp_traits: public cc::michael_list::type_traits - { - typedef HashSetHdrTest::cmp compare; - }; - - struct HRC_less_traits: public cc::michael_list::type_traits - { - typedef HashSetHdrTest::less less; - }; - - struct HRC_cmpmix_traits: public cc::michael_list::type_traits - { - typedef HashSetHdrTest::cmp compare; - typedef HashSetHdrTest::less less; - }; - } - - void HashSetHdrTest::Michael_HRC_cmp() - { - typedef cc::MichaelList< cds::gc::HRC, item, HRC_cmp_traits > list; - - // traits-based version - typedef cc::MichaelHashSet< cds::gc::HRC, list, set_traits > set; - test_int< set >(); - - // option-based version - typedef cc::MichaelHashSet< cds::gc::HRC, list, - cc::michael_set::make_traits< - cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - >::type - > opt_set; - test_int< opt_set >(); - } - - void HashSetHdrTest::Michael_HRC_less() - { - typedef cc::MichaelList< cds::gc::HRC, item, HRC_less_traits > list; - - // traits-based version - typedef cc::MichaelHashSet< cds::gc::HRC, list, set_traits > set; - test_int< set >(); - - // option-based version - typedef cc::MichaelHashSet< cds::gc::HRC, list, - cc::michael_set::make_traits< - cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - >::type - > opt_set; - test_int< opt_set >(); - } - - void HashSetHdrTest::Michael_HRC_cmpmix() - { - typedef cc::MichaelList< cds::gc::HRC, item, HRC_cmpmix_traits > list; - - // traits-based version - typedef cc::MichaelHashSet< cds::gc::HRC, list, set_traits > set; - test_int< set >(); - - // option-based version - typedef cc::MichaelHashSet< cds::gc::HRC, list, - cc::michael_set::make_traits< - cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - >::type - > opt_set; - test_int< opt_set >(); - } - - -} // namespace set diff --git a/tests/test-hdr/set/hdr_set.h b/tests/test-hdr/set/hdr_set.h index 0146bd13..46310532 100644 --- a/tests/test-hdr/set/hdr_set.h +++ b/tests/test-hdr/set/hdr_set.h @@ -829,10 +829,6 @@ namespace set { void Michael_PTB_less(); void Michael_PTB_cmpmix(); - void Michael_HRC_cmp(); - void Michael_HRC_less(); - void Michael_HRC_cmpmix(); - void Michael_RCU_GPI_cmp(); void Michael_RCU_GPI_less(); void Michael_RCU_GPI_cmpmix(); @@ -901,10 +897,6 @@ namespace set { void Split_PTB_less(); void Split_PTB_cmpmix(); - void Split_HRC_cmp(); - void Split_HRC_less(); - void Split_HRC_cmpmix(); - void Split_RCU_GPI_cmp(); void Split_RCU_GPI_less(); void Split_RCU_GPI_cmpmix(); @@ -975,10 +967,6 @@ namespace set { CPPUNIT_TEST(Michael_PTB_less) CPPUNIT_TEST(Michael_PTB_cmpmix) - CPPUNIT_TEST(Michael_HRC_cmp) - CPPUNIT_TEST(Michael_HRC_less) - CPPUNIT_TEST(Michael_HRC_cmpmix) - CPPUNIT_TEST(Michael_RCU_GPI_cmp) CPPUNIT_TEST(Michael_RCU_GPI_less) CPPUNIT_TEST(Michael_RCU_GPI_cmpmix) @@ -1047,10 +1035,6 @@ namespace set { CPPUNIT_TEST(Split_PTB_less) CPPUNIT_TEST(Split_PTB_cmpmix) - CPPUNIT_TEST(Split_HRC_cmp) - CPPUNIT_TEST(Split_HRC_less) - CPPUNIT_TEST(Split_HRC_cmpmix) - CPPUNIT_TEST(Split_RCU_GPI_cmp) CPPUNIT_TEST(Split_RCU_GPI_less) CPPUNIT_TEST(Split_RCU_GPI_cmpmix) diff --git a/tests/test-hdr/set/hdr_splitlist_set_hrc.cpp b/tests/test-hdr/set/hdr_splitlist_set_hrc.cpp deleted file mode 100644 index 35cfc15a..00000000 --- a/tests/test-hdr/set/hdr_splitlist_set_hrc.cpp +++ /dev/null @@ -1,128 +0,0 @@ -//$$CDS-header$$ - -#include "set/hdr_set.h" -#include -#include - -namespace set { - - namespace { - struct HRC_cmp_traits: public cc::split_list::type_traits - { - typedef cc::michael_list_tag ordered_list; - typedef HashSetHdrTest::hash_int hash; - typedef HashSetHdrTest::simple_item_counter item_counter; - typedef cc::opt::v::relaxed_ordering memory_model; - enum { dynamic_bucket_table = false }; - - struct ordered_list_traits: public cc::michael_list::type_traits - { - typedef HashSetHdrTest::cmp compare; - }; - }; - - struct HRC_less_traits: public cc::split_list::type_traits - { - typedef cc::michael_list_tag ordered_list; - typedef HashSetHdrTest::hash_int hash; - typedef HashSetHdrTest::simple_item_counter item_counter; - typedef cc::opt::v::sequential_consistent memory_model; - enum { dynamic_bucket_table = false }; - - struct ordered_list_traits: public cc::michael_list::type_traits - { - typedef HashSetHdrTest::less less; - }; - }; - - struct HRC_cmpmix_traits: public cc::split_list::type_traits - { - typedef cc::michael_list_tag ordered_list; - typedef HashSetHdrTest::hash_int hash; - typedef HashSetHdrTest::simple_item_counter item_counter; - - struct ordered_list_traits: public cc::michael_list::type_traits - { - typedef HashSetHdrTest::cmp compare; - typedef HashSetHdrTest::less less; - }; - }; - } - - void HashSetHdrTest::Split_HRC_cmp() - { - // traits-based version - typedef cc::SplitListSet< cds::gc::HRC, item, HRC_cmp_traits > set; - - test_int< set >(); - - // option-based version - typedef cc::SplitListSet< cds::gc::HRC, item, - cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - ,cc::opt::memory_model< cc::opt::v::relaxed_ordering > - ,cc::split_list::dynamic_bucket_table< true > - ,cc::split_list::ordered_list_traits< - cc::michael_list::make_traits< - cc::opt::compare< cmp > - >::type - > - >::type - > opt_set; - test_int< opt_set >(); - } - - void HashSetHdrTest::Split_HRC_less() - { - // traits-based version - typedef cc::SplitListSet< cds::gc::HRC, item, HRC_less_traits > set; - - test_int< set >(); - - // option-based version - typedef cc::SplitListSet< cds::gc::HRC, item, - cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - ,cc::opt::memory_model< cc::opt::v::sequential_consistent > - ,cc::split_list::dynamic_bucket_table< false > - ,cc::split_list::ordered_list_traits< - cc::michael_list::make_traits< - cc::opt::less< less > - >::type - > - >::type - > opt_set; - test_int< opt_set >(); - } - - void HashSetHdrTest::Split_HRC_cmpmix() - { - // traits-based version - typedef cc::SplitListSet< cds::gc::HRC, item, HRC_cmpmix_traits > set; - test_int< set >(); - - // option-based version - typedef cc::SplitListSet< cds::gc::HRC, item, - cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::opt::hash< hash_int > - ,cc::opt::item_counter< simple_item_counter > - ,cc::split_list::ordered_list_traits< - cc::michael_list::make_traits< - cc::opt::less< less > - ,cc::opt::compare< cmp > - >::type - > - >::type - > opt_set; - test_int< opt_set >(); - } - - -} // namespace set - - diff --git a/tests/unit/map2/map_defs.h b/tests/unit/map2/map_defs.h index a69562a2..42c94157 100644 --- a/tests/unit/map2/map_defs.h +++ b/tests/unit/map2/map_defs.h @@ -40,8 +40,6 @@ #define CDSUNIT_DECLARE_MichaelMap \ TEST_MAP_EXTRACT(MichaelMap_HP_cmp_stdAlloc) \ TEST_MAP_EXTRACT(MichaelMap_HP_less_michaelAlloc) \ - TEST_MAP_EXTRACT(MichaelMap_HRC_cmp_stdAlloc) \ - TEST_MAP_EXTRACT(MichaelMap_HRC_less_michaelAlloc) \ TEST_MAP_EXTRACT(MichaelMap_PTB_cmp_stdAlloc) \ TEST_MAP_EXTRACT(MichaelMap_PTB_less_michaelAlloc) \ TEST_MAP_EXTRACT(MichaelMap_RCU_GPI_cmp_stdAlloc) \ @@ -52,8 +50,6 @@ TEST_MAP_EXTRACT(MichaelMap_RCU_GPT_less_michaelAlloc) \ TEST_MAP_EXTRACT(MichaelMap_Lazy_HP_cmp_stdAlloc) \ TEST_MAP_EXTRACT(MichaelMap_Lazy_HP_less_michaelAlloc) \ - TEST_MAP_EXTRACT(MichaelMap_Lazy_HRC_cmp_stdAlloc) \ - TEST_MAP_EXTRACT(MichaelMap_Lazy_HRC_less_michaelAlloc) \ TEST_MAP_EXTRACT(MichaelMap_Lazy_PTB_cmp_stdAlloc) \ TEST_MAP_EXTRACT(MichaelMap_Lazy_PTB_less_michaelAlloc) \ TEST_MAP_EXTRACT(MichaelMap_Lazy_RCU_GPI_cmp_stdAlloc) \ @@ -67,8 +63,6 @@ #define CDSUNIT_TEST_MichaelMap \ CPPUNIT_TEST(MichaelMap_HP_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelMap_HP_less_michaelAlloc) \ - /*CPPUNIT_TEST(MichaelMap_HRC_cmp_stdAlloc)*/ \ - /*CPPUNIT_TEST(MichaelMap_HRC_less_michaelAlloc)*/ \ CPPUNIT_TEST(MichaelMap_PTB_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelMap_PTB_less_michaelAlloc) \ CPPUNIT_TEST(MichaelMap_RCU_GPI_cmp_stdAlloc) \ @@ -79,8 +73,6 @@ CPPUNIT_TEST(MichaelMap_RCU_GPT_less_michaelAlloc) \ CPPUNIT_TEST(MichaelMap_Lazy_HP_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelMap_Lazy_HP_less_michaelAlloc) \ - /*CPPUNIT_TEST(MichaelMap_Lazy_HRC_cmp_stdAlloc)*/ \ - /*CPPUNIT_TEST(MichaelMap_Lazy_HRC_less_michaelAlloc)*/ \ CPPUNIT_TEST(MichaelMap_Lazy_PTB_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelMap_Lazy_PTB_less_michaelAlloc) \ CPPUNIT_TEST(MichaelMap_Lazy_RCU_GPI_cmp_stdAlloc) \ @@ -150,10 +142,6 @@ TEST_MAP_EXTRACT(SplitList_Michael_HP_st_cmp)\ TEST_MAP_EXTRACT(SplitList_Michael_HP_dyn_less)\ TEST_MAP_EXTRACT(SplitList_Michael_HP_st_less)\ - TEST_MAP_EXTRACT(SplitList_Michael_HRC_dyn_cmp)\ - TEST_MAP_EXTRACT(SplitList_Michael_HRC_st_cmp)\ - TEST_MAP_EXTRACT(SplitList_Michael_HRC_dyn_less)\ - TEST_MAP_EXTRACT(SplitList_Michael_HRC_st_less)\ TEST_MAP_EXTRACT(SplitList_Michael_PTB_dyn_cmp)\ TEST_MAP_EXTRACT(SplitList_Michael_PTB_st_cmp)\ TEST_MAP_EXTRACT(SplitList_Michael_PTB_dyn_less)\ @@ -174,10 +162,6 @@ TEST_MAP_EXTRACT(SplitList_Lazy_HP_st_cmp)\ TEST_MAP_EXTRACT(SplitList_Lazy_HP_dyn_less)\ TEST_MAP_EXTRACT(SplitList_Lazy_HP_st_less)\ - TEST_MAP_EXTRACT(SplitList_Lazy_HRC_dyn_cmp)\ - TEST_MAP_EXTRACT(SplitList_Lazy_HRC_st_cmp)\ - TEST_MAP_EXTRACT(SplitList_Lazy_HRC_dyn_less)\ - TEST_MAP_EXTRACT(SplitList_Lazy_HRC_st_less)\ TEST_MAP_EXTRACT(SplitList_Lazy_PTB_dyn_cmp)\ TEST_MAP_EXTRACT(SplitList_Lazy_PTB_st_cmp)\ TEST_MAP_EXTRACT(SplitList_Lazy_PTB_dyn_less)\ @@ -201,10 +185,6 @@ CPPUNIT_TEST(SplitList_Michael_HP_st_cmp)\ CPPUNIT_TEST(SplitList_Michael_HP_dyn_less)\ CPPUNIT_TEST(SplitList_Michael_HP_st_less)\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_dyn_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_st_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_dyn_less)*/\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_st_less)*/\ CPPUNIT_TEST(SplitList_Michael_PTB_dyn_cmp)\ CPPUNIT_TEST(SplitList_Michael_PTB_st_cmp)\ CPPUNIT_TEST(SplitList_Michael_PTB_dyn_less)\ @@ -225,10 +205,6 @@ CPPUNIT_TEST(SplitList_Lazy_HP_st_cmp)\ CPPUNIT_TEST(SplitList_Lazy_HP_dyn_less)\ CPPUNIT_TEST(SplitList_Lazy_HP_st_less)\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_dyn_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_st_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_dyn_less)*/\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_st_less)*/\ CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_cmp)\ CPPUNIT_TEST(SplitList_Lazy_PTB_st_cmp)\ CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_less)\ diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h index aefc04ff..21037d8a 100644 --- a/tests/unit/map2/map_types.h +++ b/tests/unit/map2/map_types.h @@ -10,13 +10,11 @@ #include #include -#include #include #include #include #include -#include #include #include #include @@ -35,7 +33,6 @@ #include #include -#include #include #include #include @@ -260,46 +257,6 @@ namespace map2 { >::type > MichaelList_HP_less_michaelAlloc; - typedef cc::MichaelKVList< cds::gc::HRC, Key, Value, - typename cc::michael_list::make_traits< - co::compare< compare > - >::type - > MichaelList_HRC_cmp_stdAlloc; - - typedef cc::MichaelKVList< cds::gc::HRC, Key, Value, - typename cc::michael_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > MichaelList_HRC_cmp_stdAlloc_seqcst; - - typedef cc::MichaelKVList< cds::gc::HRC, Key, Value, - typename cc::michael_list::make_traits< - co::compare< compare >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelList_HRC_cmp_michaelAlloc; - - typedef cc::MichaelKVList< cds::gc::HRC, Key, Value, - typename cc::michael_list::make_traits< - co::less< less > - >::type - > MichaelList_HRC_less_stdAlloc; - - typedef cc::MichaelKVList< cds::gc::HRC, Key, Value, - typename cc::michael_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > MichaelList_HRC_less_stdAlloc_seqcst; - - typedef cc::MichaelKVList< cds::gc::HRC, Key, Value, - typename cc::michael_list::make_traits< - co::less< less >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelList_HRC_less_michaelAlloc; - typedef cc::MichaelKVList< cds::gc::PTB, Key, Value, typename cc::michael_list::make_traits< co::compare< compare > @@ -739,44 +696,6 @@ namespace map2 { >::type > MichaelMap_HP_less_michaelAlloc; - typedef cc::MichaelHashMap< cds::gc::HRC, MichaelList_HRC_cmp_stdAlloc, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_HRC_cmp_stdAlloc; - - typedef cc::MichaelHashMap< cds::gc::HRC, MichaelList_HRC_cmp_stdAlloc_seqcst, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_HRC_cmp_stdAlloc_seqcst; - - typedef cc::MichaelHashMap< cds::gc::HRC, MichaelList_HRC_cmp_michaelAlloc, - typename cc::michael_map::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelMap_HRC_cmp_michaelAlloc; - - typedef cc::MichaelHashMap< cds::gc::HRC, MichaelList_HRC_less_stdAlloc, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_HRC_less_stdAlloc; - - typedef cc::MichaelHashMap< cds::gc::HRC, MichaelList_HRC_less_stdAlloc_seqcst, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_HRC_less_stdAlloc_seqcst; - - typedef cc::MichaelHashMap< cds::gc::HRC, MichaelList_HRC_less_michaelAlloc, - typename cc::michael_map::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelMap_HRC_less_michaelAlloc; - typedef cc::MichaelHashMap< cds::gc::PTB, MichaelList_PTB_cmp_stdAlloc, typename cc::michael_map::make_traits< co::hash< hash > @@ -1094,46 +1013,6 @@ namespace map2 { >::type > LazyList_HP_less_michaelAlloc; - typedef cc::LazyKVList< cds::gc::HRC, Key, Value, - typename cc::lazy_list::make_traits< - co::compare< compare > - >::type - > LazyList_HRC_cmp_stdAlloc; - - typedef cc::LazyKVList< cds::gc::HRC, Key, Value, - typename cc::lazy_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > LazyList_HRC_cmp_stdAlloc_seqcst; - - typedef cc::LazyKVList< cds::gc::HRC, Key, Value, - typename cc::lazy_list::make_traits< - co::compare< compare >, - co::allocator< memory::MichaelAllocator > - >::type - > LazyList_HRC_cmp_michaelAlloc; - - typedef cc::LazyKVList< cds::gc::HRC, Key, Value, - typename cc::lazy_list::make_traits< - co::less< less > - >::type - > LazyList_HRC_less_stdAlloc; - - typedef cc::LazyKVList< cds::gc::HRC, Key, Value, - typename cc::lazy_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > LazyList_HRC_less_stdAlloc_seqcst; - - typedef cc::LazyKVList< cds::gc::HRC, Key, Value, - typename cc::lazy_list::make_traits< - co::less< less >, - co::allocator< memory::MichaelAllocator > - >::type - > LazyList_HRC_less_michaelAlloc; - typedef cc::LazyKVList< cds::gc::PTB, Key, Value, typename cc::lazy_list::make_traits< co::compare< compare > @@ -1463,44 +1342,6 @@ namespace map2 { >::type > MichaelMap_Lazy_HP_less_michaelAlloc; - typedef cc::MichaelHashMap< cds::gc::HRC, LazyList_HRC_cmp_stdAlloc, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_Lazy_HRC_cmp_stdAlloc; - - typedef cc::MichaelHashMap< cds::gc::HRC, LazyList_HRC_cmp_stdAlloc_seqcst, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_Lazy_HRC_cmp_stdAlloc_seqcst; - - typedef cc::MichaelHashMap< cds::gc::HRC, LazyList_HRC_cmp_michaelAlloc, - typename cc::michael_map::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelMap_Lazy_HRC_cmp_michaelAlloc; - - typedef cc::MichaelHashMap< cds::gc::HRC, LazyList_HRC_less_stdAlloc, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_Lazy_HRC_less_stdAlloc; - - typedef cc::MichaelHashMap< cds::gc::HRC, LazyList_HRC_less_stdAlloc_seqcst, - typename cc::michael_map::make_traits< - co::hash< hash > - >::type - > MichaelMap_Lazy_HRC_less_stdAlloc_seqcst; - - typedef cc::MichaelHashMap< cds::gc::HRC, LazyList_HRC_less_michaelAlloc, - typename cc::michael_map::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelMap_Lazy_HRC_less_michaelAlloc; - typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_PTB_cmp_stdAlloc, typename cc::michael_map::make_traits< co::hash< hash > @@ -1889,116 +1730,6 @@ namespace map2 { {}; typedef cc::SplitListMap< cds::gc::HP, Key, Value, traits_SplitList_Michael_HP_st_less_seqcst > SplitList_Michael_HP_st_less_seqcst; - // HRC - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_cmp; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_cmp_seqcst; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Michael_HRC_st_cmp; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_st_cmp_seqcst; - - // HRC + less - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_less; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_less_seqcst; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Michael_HRC_st_less; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_st_less_seqcst; - // PTB typedef cc::SplitListMap< cds::gc::PTB, Key, Value, typename cc::split_list::make_traits< @@ -2885,117 +2616,6 @@ namespace map2 { >::type > SplitList_Lazy_HP_st_less_seqcst; - // HRC - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_cmp; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_cmp_seqcst; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Lazy_HRC_st_cmp; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_st_cmp_seqcst; - - // HRC + less - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_less; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_less_seqcst; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Lazy_HRC_st_less; - - typedef cc::SplitListMap< cds::gc::HRC, Key, Value, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_st_less_seqcst; - - // PTB typedef cc::SplitListMap< cds::gc::PTB, Key, Value, typename cc::split_list::make_traits< @@ -4222,86 +3842,6 @@ namespace map2 { {}; typedef cc::SkipListMap< cds::gc::HP, Key, Value, traits_SkipListMap_hp_cmp_xorshift_stat > SkipListMap_hp_cmp_xorshift_stat; - // *************************************************************************** - // SkipListMap - HRC - - class traits_SkipListMap_hrc_less_pascal: public cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_less_pascal > SkipListMap_hrc_less_pascal; - - class traits_SkipListMap_hrc_less_pascal_seqcst: public cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::memory_model< co::v::sequential_consistent > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_less_pascal_seqcst > SkipListMap_hrc_less_pascal_seqcst; - - class traits_SkipListMap_hrc_less_pascal_stat: public cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::stat< cc::skip_list::stat<> > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_less_pascal_stat > SkipListMap_hrc_less_pascal_stat; - - class traits_SkipListMap_hrc_cmp_pascal: public cc::skip_list::make_traits < - co::compare< compare > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_cmp_pascal > SkipListMap_hrc_cmp_pascal; - - class traits_SkipListMap_hrc_cmp_pascal_stat: public cc::skip_list::make_traits < - co::compare< compare > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::stat< cc::skip_list::stat<> > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_cmp_pascal_stat > SkipListMap_hrc_cmp_pascal_stat; - - class traits_SkipListMap_hrc_less_xorshift: public cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_less_xorshift > SkipListMap_hrc_less_xorshift; - - class traits_SkipListMap_hrc_less_xorshift_stat: public cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::stat< cc::skip_list::stat<> > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_less_xorshift_stat > SkipListMap_hrc_less_xorshift_stat; - - class traits_SkipListMap_hrc_cmp_xorshift: public cc::skip_list::make_traits < - co::compare< compare > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_cmp_xorshift > SkipListMap_hrc_cmp_xorshift; - - class traits_SkipListMap_hrc_cmp_xorshift_stat: public cc::skip_list::make_traits < - co::compare< compare > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::stat< cc::skip_list::stat<> > - ,co::item_counter< cds::atomicity::item_counter > - >::type - {}; - typedef cc::SkipListMap< cds::gc::HRC, Key, Value, traits_SkipListMap_hrc_cmp_xorshift_stat > SkipListMap_hrc_cmp_xorshift_stat; - // *************************************************************************** // SkipListMap - PTB diff --git a/tests/unit/set2/set_defs.h b/tests/unit/set2/set_defs.h index 31cdb631..e5af4a4c 100644 --- a/tests/unit/set2/set_defs.h +++ b/tests/unit/set2/set_defs.h @@ -39,8 +39,6 @@ #define CDSUNIT_DECLARE_MichaelSet \ TEST_SET_EXTRACT(MichaelSet_HP_cmp_stdAlloc) \ TEST_SET_EXTRACT(MichaelSet_HP_less_michaelAlloc) \ - /*TEST_SET_EXTRACT(MichaelSet_HRC_cmp_stdAlloc)*/ \ - /*TEST_SET_EXTRACT(MichaelSet_HRC_less_michaelAlloc)*/ \ TEST_SET_EXTRACT(MichaelSet_PTB_cmp_stdAlloc) \ TEST_SET_EXTRACT(MichaelSet_PTB_less_michaelAlloc) \ TEST_SET_EXTRACT(MichaelSet_RCU_GPI_cmp_stdAlloc) \ @@ -51,8 +49,6 @@ TEST_SET_EXTRACT(MichaelSet_RCU_GPT_less_michaelAlloc) \ TEST_SET_EXTRACT(MichaelSet_Lazy_HP_cmp_stdAlloc) \ TEST_SET_EXTRACT(MichaelSet_Lazy_HP_less_michaelAlloc) \ - /*TEST_SET_EXTRACT(MichaelSet_Lazy_HRC_cmp_stdAlloc)*/ \ - /*TEST_SET_EXTRACT(MichaelSet_Lazy_HRC_less_michaelAlloc)*/ \ TEST_SET_EXTRACT(MichaelSet_Lazy_PTB_cmp_stdAlloc) \ TEST_SET_EXTRACT(MichaelSet_Lazy_PTB_less_michaelAlloc) \ TEST_SET_EXTRACT(MichaelSet_Lazy_RCU_GPI_cmp_stdAlloc) \ @@ -66,8 +62,6 @@ #define CDSUNIT_TEST_MichaelSet \ CPPUNIT_TEST(MichaelSet_HP_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelSet_HP_less_michaelAlloc) \ - /*CPPUNIT_TEST(MichaelSet_HRC_cmp_stdAlloc)*/ \ - /*CPPUNIT_TEST(MichaelSet_HRC_less_michaelAlloc)*/ \ CPPUNIT_TEST(MichaelSet_PTB_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelSet_PTB_less_michaelAlloc) \ CPPUNIT_TEST(MichaelSet_RCU_GPI_cmp_stdAlloc) \ @@ -78,8 +72,6 @@ CPPUNIT_TEST(MichaelSet_RCU_GPT_less_michaelAlloc) \ CPPUNIT_TEST(MichaelSet_Lazy_HP_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelSet_Lazy_HP_less_michaelAlloc) \ - /*CPPUNIT_TEST(MichaelSet_Lazy_HRC_cmp_stdAlloc)*/ \ - /*CPPUNIT_TEST(MichaelSet_Lazy_HRC_less_michaelAlloc)*/ \ CPPUNIT_TEST(MichaelSet_Lazy_PTB_cmp_stdAlloc) \ CPPUNIT_TEST(MichaelSet_Lazy_PTB_less_michaelAlloc) \ CPPUNIT_TEST(MichaelSet_Lazy_RCU_GPI_cmp_stdAlloc) \ @@ -138,10 +130,6 @@ TEST_SET_EXTRACT(SplitList_Michael_HP_st_cmp)\ TEST_SET_EXTRACT(SplitList_Michael_HP_dyn_less)\ TEST_SET_EXTRACT(SplitList_Michael_HP_st_less)\ - TEST_SET_EXTRACT(SplitList_Michael_HRC_dyn_cmp)\ - TEST_SET_EXTRACT(SplitList_Michael_HRC_st_cmp)\ - TEST_SET_EXTRACT(SplitList_Michael_HRC_dyn_less)\ - TEST_SET_EXTRACT(SplitList_Michael_HRC_st_less)\ TEST_SET_EXTRACT(SplitList_Michael_PTB_dyn_cmp)\ TEST_SET_EXTRACT(SplitList_Michael_PTB_st_cmp)\ TEST_SET_EXTRACT(SplitList_Michael_PTB_dyn_less)\ @@ -162,10 +150,6 @@ TEST_SET_EXTRACT(SplitList_Lazy_HP_st_cmp)\ TEST_SET_EXTRACT(SplitList_Lazy_HP_dyn_less)\ TEST_SET_EXTRACT(SplitList_Lazy_HP_st_less)\ - TEST_SET_EXTRACT(SplitList_Lazy_HRC_dyn_cmp)\ - TEST_SET_EXTRACT(SplitList_Lazy_HRC_st_cmp)\ - TEST_SET_EXTRACT(SplitList_Lazy_HRC_dyn_less)\ - TEST_SET_EXTRACT(SplitList_Lazy_HRC_st_less)\ TEST_SET_EXTRACT(SplitList_Lazy_PTB_dyn_cmp)\ TEST_SET_EXTRACT(SplitList_Lazy_PTB_st_cmp)\ TEST_SET_EXTRACT(SplitList_Lazy_PTB_dyn_less)\ @@ -189,10 +173,6 @@ CPPUNIT_TEST(SplitList_Michael_HP_st_cmp)\ CPPUNIT_TEST(SplitList_Michael_HP_dyn_less)\ CPPUNIT_TEST(SplitList_Michael_HP_st_less)\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_dyn_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_st_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_dyn_less)*/\ - /*CPPUNIT_TEST(SplitList_Michael_HRC_st_less)*/\ CPPUNIT_TEST(SplitList_Michael_PTB_dyn_cmp)\ CPPUNIT_TEST(SplitList_Michael_PTB_st_cmp)\ CPPUNIT_TEST(SplitList_Michael_PTB_dyn_less)\ @@ -213,10 +193,6 @@ CPPUNIT_TEST(SplitList_Lazy_HP_st_cmp)\ CPPUNIT_TEST(SplitList_Lazy_HP_dyn_less)\ CPPUNIT_TEST(SplitList_Lazy_HP_st_less)\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_dyn_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_st_cmp)*/\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_dyn_less)*/\ - /*CPPUNIT_TEST(SplitList_Lazy_HRC_st_less)*/\ CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_cmp)\ CPPUNIT_TEST(SplitList_Lazy_PTB_st_cmp)\ CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_less)\ @@ -322,10 +298,6 @@ TEST_SET_NOLF_EXTRACT(SkipListSet_hp_cmp_pascal_stat)\ TEST_SET_NOLF_EXTRACT(SkipListSet_hp_less_xorshift)\ TEST_SET_NOLF_EXTRACT(SkipListSet_hp_cmp_xorshift_stat)\ - TEST_SET_NOLF_EXTRACT(SkipListSet_hrc_less_pascal)\ - TEST_SET_NOLF_EXTRACT(SkipListSet_hrc_cmp_pascal_stat)\ - TEST_SET_NOLF_EXTRACT(SkipListSet_hrc_less_xorshift)\ - TEST_SET_NOLF_EXTRACT(SkipListSet_hrc_cmp_xorshift_stat)\ TEST_SET_NOLF_EXTRACT(SkipListSet_ptb_less_pascal)\ TEST_SET_NOLF_EXTRACT(SkipListSet_ptb_cmp_pascal_stat)\ TEST_SET_NOLF_EXTRACT(SkipListSet_ptb_less_xorshift)\ @@ -349,10 +321,6 @@ CPPUNIT_TEST(SkipListSet_hp_cmp_pascal_stat)\ CPPUNIT_TEST(SkipListSet_hp_less_xorshift)\ CPPUNIT_TEST(SkipListSet_hp_cmp_xorshift_stat)\ - /*CPPUNIT_TEST(SkipListSet_hrc_less_pascal)*/\ - /*CPPUNIT_TEST(SkipListSet_hrc_cmp_pascal_stat)*/\ - /*CPPUNIT_TEST(SkipListSet_hrc_less_xorshift)*/\ - /*CPPUNIT_TEST(SkipListSet_hrc_cmp_xorshift_stat)*/\ CPPUNIT_TEST(SkipListSet_ptb_less_pascal)\ CPPUNIT_TEST(SkipListSet_ptb_cmp_pascal_stat)\ CPPUNIT_TEST(SkipListSet_ptb_less_xorshift)\ diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h index 6b5d5de3..3263e100 100644 --- a/tests/unit/set2/set_types.h +++ b/tests/unit/set2/set_types.h @@ -10,11 +10,9 @@ #include #include -#include #include #include #include -#include #include #include @@ -27,7 +25,6 @@ #include #include -#include #include #include @@ -355,46 +352,6 @@ namespace set2 { >::type > MichaelList_HP_less_michaelAlloc; - typedef cc::MichaelList< cds::gc::HRC, key_val, - typename cc::michael_list::make_traits< - co::compare< compare > - >::type - > MichaelList_HRC_cmp_stdAlloc; - - typedef cc::MichaelList< cds::gc::HRC, key_val, - typename cc::michael_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > MichaelList_HRC_cmp_stdAlloc_seqcst; - - typedef cc::MichaelList< cds::gc::HRC, key_val, - typename cc::michael_list::make_traits< - co::compare< compare >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelList_HRC_cmp_michaelAlloc; - - typedef cc::MichaelList< cds::gc::HRC, key_val, - typename cc::michael_list::make_traits< - co::less< less > - >::type - > MichaelList_HRC_less_stdAlloc; - - typedef cc::MichaelList< cds::gc::HRC, key_val, - typename cc::michael_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > MichaelList_HRC_less_stdAlloc_seqcst; - - typedef cc::MichaelList< cds::gc::HRC, key_val, - typename cc::michael_list::make_traits< - co::less< less >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelList_HRC_less_michaelAlloc; - typedef cc::MichaelList< cds::gc::PTB, key_val, typename cc::michael_list::make_traits< co::compare< compare > @@ -682,44 +639,6 @@ namespace set2 { >::type > MichaelSet_HP_less_michaelAlloc; - typedef cc::MichaelHashSet< cds::gc::HRC, MichaelList_HRC_cmp_stdAlloc, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_HRC_cmp_stdAlloc; - - typedef cc::MichaelHashSet< cds::gc::HRC, MichaelList_HRC_cmp_stdAlloc_seqcst, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_HRC_cmp_stdAlloc_seqcst; - - typedef cc::MichaelHashSet< cds::gc::HRC, MichaelList_HRC_cmp_michaelAlloc, - typename cc::michael_set::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelSet_HRC_cmp_michaelAlloc; - - typedef cc::MichaelHashSet< cds::gc::HRC, MichaelList_HRC_less_stdAlloc, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_HRC_less_stdAlloc; - - typedef cc::MichaelHashSet< cds::gc::HRC, MichaelList_HRC_less_stdAlloc_seqcst, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_HRC_less_stdAlloc_seqcst; - - typedef cc::MichaelHashSet< cds::gc::HRC, MichaelList_HRC_less_michaelAlloc, - typename cc::michael_set::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelSet_HRC_less_michaelAlloc; - typedef cc::MichaelHashSet< cds::gc::PTB, MichaelList_PTB_cmp_stdAlloc, typename cc::michael_set::make_traits< co::hash< hash > @@ -999,46 +918,6 @@ namespace set2 { >::type > LazyList_HP_less_michaelAlloc; - typedef cc::LazyList< cds::gc::HRC, key_val, - typename cc::lazy_list::make_traits< - co::compare< compare > - >::type - > LazyList_HRC_cmp_stdAlloc; - - typedef cc::LazyList< cds::gc::HRC, key_val, - typename cc::lazy_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > LazyList_HRC_cmp_stdAlloc_seqcst; - - typedef cc::LazyList< cds::gc::HRC, key_val, - typename cc::lazy_list::make_traits< - co::compare< compare >, - co::allocator< memory::MichaelAllocator > - >::type - > LazyList_HRC_cmp_michaelAlloc; - - typedef cc::LazyList< cds::gc::HRC, key_val, - typename cc::lazy_list::make_traits< - co::less< less > - >::type - > LazyList_HRC_less_stdAlloc; - - typedef cc::LazyList< cds::gc::HRC, key_val, - typename cc::lazy_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > LazyList_HRC_less_stdAlloc_seqcst; - - typedef cc::LazyList< cds::gc::HRC, key_val, - typename cc::lazy_list::make_traits< - co::less< less >, - co::allocator< memory::MichaelAllocator > - >::type - > LazyList_HRC_less_michaelAlloc; - typedef cc::LazyList< cds::gc::PTB, key_val, typename cc::lazy_list::make_traits< co::compare< compare > @@ -1326,44 +1205,6 @@ namespace set2 { >::type > MichaelSet_Lazy_HP_less_michaelAlloc; - typedef cc::MichaelHashSet< cds::gc::HRC, LazyList_HRC_cmp_stdAlloc, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_Lazy_HRC_cmp_stdAlloc; - - typedef cc::MichaelHashSet< cds::gc::HRC, LazyList_HRC_cmp_stdAlloc_seqcst, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_Lazy_HRC_cmp_stdAlloc_seqcst; - - typedef cc::MichaelHashSet< cds::gc::HRC, LazyList_HRC_cmp_michaelAlloc, - typename cc::michael_set::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelSet_Lazy_HRC_cmp_michaelAlloc; - - typedef cc::MichaelHashSet< cds::gc::HRC, LazyList_HRC_less_stdAlloc, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_Lazy_HRC_less_stdAlloc; - - typedef cc::MichaelHashSet< cds::gc::HRC, LazyList_HRC_less_stdAlloc_seqcst, - typename cc::michael_set::make_traits< - co::hash< hash > - >::type - > MichaelSet_Lazy_HRC_less_stdAlloc_seqcst; - - typedef cc::MichaelHashSet< cds::gc::HRC, LazyList_HRC_less_michaelAlloc, - typename cc::michael_set::make_traits< - co::hash< hash >, - co::allocator< memory::MichaelAllocator > - >::type - > MichaelSet_Lazy_HRC_less_michaelAlloc; - typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_PTB_cmp_stdAlloc, typename cc::michael_set::make_traits< co::hash< hash > @@ -1711,116 +1552,6 @@ namespace set2 { >::type > SplitList_Michael_HP_st_less_seqcst; - // HRC - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_cmp; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_cmp_seqcst; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Michael_HRC_st_cmp; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_st_cmp_seqcst; - - // HRC + less - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_less; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_dyn_less_seqcst; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Michael_HRC_st_less; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::michael_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Michael_HRC_st_less_seqcst; - // PTB typedef cc::SplitListSet< cds::gc::PTB, key_val, typename cc::split_list::make_traits< @@ -2597,117 +2328,6 @@ namespace set2 { >::type > SplitList_Lazy_HP_st_less_seqcst; - // HRC - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_cmp; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_cmp_seqcst; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - >::type - > - >::type - > SplitList_Lazy_HRC_st_cmp; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::compare< compare > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_st_cmp_seqcst; - - // HRC + less - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_less; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_dyn_less_seqcst; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,cc::split_list::dynamic_bucket_table< false > - ,co::hash< hash > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - >::type - > - >::type - > SplitList_Lazy_HRC_st_less; - - typedef cc::SplitListSet< cds::gc::HRC, key_val, - typename cc::split_list::make_traits< - cc::split_list::ordered_list - ,co::hash< hash > - ,cc::split_list::dynamic_bucket_table< false > - ,co::memory_model< co::v::sequential_consistent > - ,cc::split_list::ordered_list_traits< - typename cc::lazy_list::make_traits< - co::less< less > - ,co::memory_model< co::v::sequential_consistent > - >::type - > - >::type - > SplitList_Lazy_HRC_st_less_seqcst; - - // PTB typedef cc::SplitListSet< cds::gc::PTB, key_val, typename cc::split_list::make_traits< @@ -3884,86 +3504,6 @@ namespace set2 { {}; typedef cc::SkipListSet< cds::gc::HP, key_val, traits_SkipListSet_hp_cmp_xorshift_stat > SkipListSet_hp_cmp_xorshift_stat; - // *************************************************************************** - // SkipListSet - HRC - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::less< less > - ,co::item_counter< cds::atomicity::item_counter > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - >::type - > SkipListSet_hrc_less_pascal; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::memory_model< co::v::sequential_consistent > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > SkipListSet_hrc_less_pascal_seqcst; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::less< less > - ,co::item_counter< cds::atomicity::item_counter > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::stat< cc::skip_list::stat<> > - >::type - > SkipListSet_hrc_less_pascal_stat; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::compare< compare > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > SkipListSet_hrc_cmp_pascal; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::compare< compare > - ,co::item_counter< cds::atomicity::item_counter > - ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal > - ,co::stat< cc::skip_list::stat<> > - >::type - > SkipListSet_hrc_cmp_pascal_stat; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > SkipListSet_hrc_less_xorshift; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::less< less > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::stat< cc::skip_list::stat<> > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > SkipListSet_hrc_less_xorshift_stat; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::compare< compare > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > SkipListSet_hrc_cmp_xorshift; - - typedef cc::SkipListSet< cds::gc::HRC, key_val, - typename cc::skip_list::make_traits < - co::compare< compare > - ,cc::skip_list::random_level_generator< cc::skip_list::xorshift > - ,co::stat< cc::skip_list::stat<> > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > SkipListSet_hrc_cmp_xorshift_stat; - // *************************************************************************** // SkipListSet - PTB