Replace PTB with DHP in unit tests

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 736b7bd2d54da242c1a7674a32b69ebe48da11dd..b6345882d3d51f31b47ce8ca9c782625afe66fd1 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -695,7 +695,6 @@
     <ClInclude Include="..\..\..\cds\container\mspriority_queue.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_map_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_map_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\container\skip_list_map_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_map_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_set_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_set_hp.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 2503c601933f2a1d0511c9c9a7a098a680151bc7..a2508bb8171d3ef6de80e0f4b47f58e94e0bc501 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -881,9 +881,6 @@
     <ClInclude Include="..\..\..\cds\container\skip_list_map_hp.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\skip_list_map_ptb.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_map.h">\r
       <Filter>Header Files\cds\container\details</Filter>\r
     </ClInclude>\r

diff --git a/tests/unit/map2/map_defs.h b/tests/unit/map2/map_defs.h
index 42c9415749a73d51a7aee11a5c8777ce8ccffea3..bc8585a2b5fe2731ed2e3034cd9deb3bad6d17d5 100644 (file)
--- a/tests/unit/map2/map_defs.h
+++ b/tests/unit/map2/map_defs.h
@@ -40,8 +40,8 @@
 #define CDSUNIT_DECLARE_MichaelMap  \
     TEST_MAP_EXTRACT(MichaelMap_HP_cmp_stdAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_HP_less_michaelAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_PTB_cmp_stdAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_PTB_less_michaelAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_DHP_cmp_stdAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_DHP_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_RCU_GPI_cmp_stdAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_RCU_GPI_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_RCU_GPB_cmp_stdAlloc) \
@@ -50,8 +50,8 @@
     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_PTB_cmp_stdAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_Lazy_PTB_less_michaelAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_Lazy_DHP_cmp_stdAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_Lazy_DHP_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_RCU_GPI_cmp_stdAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_RCU_GPI_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_RCU_GPB_cmp_stdAlloc) \
@@ -63,8 +63,8 @@
 #define CDSUNIT_TEST_MichaelMap  \
     CPPUNIT_TEST(MichaelMap_HP_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelMap_HP_less_michaelAlloc) \
-    CPPUNIT_TEST(MichaelMap_PTB_cmp_stdAlloc) \
-    CPPUNIT_TEST(MichaelMap_PTB_less_michaelAlloc) \
+    CPPUNIT_TEST(MichaelMap_DHP_cmp_stdAlloc) \
+    CPPUNIT_TEST(MichaelMap_DHP_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_RCU_GPI_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelMap_RCU_GPI_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_RCU_GPB_cmp_stdAlloc) \
@@ -73,8 +73,8 @@
     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_PTB_cmp_stdAlloc) \
-    CPPUNIT_TEST(MichaelMap_Lazy_PTB_less_michaelAlloc) \
+    CPPUNIT_TEST(MichaelMap_Lazy_DHP_cmp_stdAlloc) \
+    CPPUNIT_TEST(MichaelMap_Lazy_DHP_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_RCU_GPI_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_RCU_GPI_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_RCU_GPB_cmp_stdAlloc) \
@@ -142,10 +142,10 @@
     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_PTB_dyn_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Michael_PTB_st_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Michael_PTB_dyn_less)\
-    TEST_MAP_EXTRACT(SplitList_Michael_PTB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_st_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_dyn_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_st_less)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_dyn_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_dyn_less)\
@@ -162,10 +162,10 @@
     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_PTB_dyn_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_PTB_st_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_PTB_dyn_less)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_PTB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_st_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_dyn_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_st_less)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_dyn_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_dyn_less)\
@@ -185,10 +185,10 @@
     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_PTB_dyn_cmp)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_st_cmp)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_dyn_less)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_st_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_dyn_less)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_st_less)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_dyn_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_dyn_less)\
@@ -205,10 +205,10 @@
     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_PTB_dyn_cmp)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_st_cmp)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_less)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_st_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_dyn_less)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_st_less)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_dyn_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_dyn_less)\

diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index 6dbf1d98c6b8f8dd017c5c364aef77027cbb16b2..d79465096f6eaab1b2e0b0ec8b9eb6dbe13cda63 100644 (file)
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -257,45 +257,45 @@ namespace map2 {
             >::type
         >   MichaelList_HP_less_michaelAlloc;
 
-        typedef cc::MichaelKVList< cds::gc::PTB, Key, Value,
+        typedef cc::MichaelKVList< cds::gc::DHP, Key, Value,
             typename cc::michael_list::make_traits<
                 co::compare< compare >
             >::type
-        >   MichaelList_PTB_cmp_stdAlloc;
+        >   MichaelList_DHP_cmp_stdAlloc;
 
-        typedef cc::MichaelKVList< cds::gc::PTB, Key, Value,
+        typedef cc::MichaelKVList< cds::gc::DHP, Key, Value,
             typename cc::michael_list::make_traits<
                 co::compare< compare >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   MichaelList_PTB_cmp_stdAlloc_seqcst;
+        >   MichaelList_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelKVList< cds::gc::PTB, Key, Value,
+        typedef cc::MichaelKVList< cds::gc::DHP, Key, Value,
             typename cc::michael_list::make_traits<
                 co::compare< compare >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelList_PTB_cmp_michaelAlloc;
+        >   MichaelList_DHP_cmp_michaelAlloc;
 
-        typedef cc::MichaelKVList< cds::gc::PTB, Key, Value,
+        typedef cc::MichaelKVList< cds::gc::DHP, Key, Value,
             typename cc::michael_list::make_traits<
                 co::less< less >
             >::type
-        >   MichaelList_PTB_less_stdAlloc;
+        >   MichaelList_DHP_less_stdAlloc;
 
-        typedef cc::MichaelKVList< cds::gc::PTB, Key, Value,
+        typedef cc::MichaelKVList< cds::gc::DHP, Key, Value,
             typename cc::michael_list::make_traits<
                 co::less< less >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   MichaelList_PTB_less_stdAlloc_seqcst;
+        >   MichaelList_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelKVList< cds::gc::PTB, Key, Value,
+        typedef cc::MichaelKVList< cds::gc::DHP, Key, Value,
             typename cc::michael_list::make_traits<
                 co::less< less >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelList_PTB_less_michaelAlloc;
+        >   MichaelList_DHP_less_michaelAlloc;
 
         // RCU
         typedef cc::MichaelKVList< rcu_gpi, Key, Value,
@@ -696,43 +696,43 @@ namespace map2 {
             >::type
         >   MichaelMap_HP_less_michaelAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, MichaelList_PTB_cmp_stdAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, MichaelList_DHP_cmp_stdAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_PTB_cmp_stdAlloc;
+        >   MichaelMap_DHP_cmp_stdAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, MichaelList_PTB_cmp_stdAlloc_seqcst,
+        typedef cc::MichaelHashMap< cds::gc::DHP, MichaelList_DHP_cmp_stdAlloc_seqcst,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_PTB_cmp_stdAlloc_seqcst;
+        >   MichaelMap_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, MichaelList_PTB_cmp_michaelAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, MichaelList_DHP_cmp_michaelAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelMap_PTB_cmp_michaelAlloc;
+        >   MichaelMap_DHP_cmp_michaelAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, MichaelList_PTB_less_stdAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, MichaelList_DHP_less_stdAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_PTB_less_stdAlloc;
+        >   MichaelMap_DHP_less_stdAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, MichaelList_PTB_less_stdAlloc_seqcst,
+        typedef cc::MichaelHashMap< cds::gc::DHP, MichaelList_DHP_less_stdAlloc_seqcst,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_PTB_less_stdAlloc_seqcst;
+        >   MichaelMap_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, MichaelList_PTB_less_michaelAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, MichaelList_DHP_less_michaelAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelMap_PTB_less_michaelAlloc;
+        >   MichaelMap_DHP_less_michaelAlloc;
 
         //RCU
         typedef cc::MichaelHashMap< rcu_gpi, MichaelList_RCU_GPI_cmp_stdAlloc,
@@ -1342,43 +1342,43 @@ namespace map2 {
             >::type
         >   MichaelMap_Lazy_HP_less_michaelAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, LazyList_DHP_cmp_stdAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_Lazy_PTB_cmp_stdAlloc;
+        >   MichaelMap_Lazy_DHP_cmp_stdAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc_seqcst,
+        typedef cc::MichaelHashMap< cds::gc::DHP, LazyList_DHP_cmp_stdAlloc_seqcst,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_Lazy_PTB_cmp_stdAlloc_seqcst;
+        >   MichaelMap_Lazy_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_cmp_michaelAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, LazyList_DHP_cmp_michaelAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelMap_Lazy_PTB_cmp_michaelAlloc;
+        >   MichaelMap_Lazy_DHP_cmp_michaelAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_less_stdAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, LazyList_DHP_less_stdAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_Lazy_PTB_less_stdAlloc;
+        >   MichaelMap_Lazy_DHP_less_stdAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_less_stdAlloc_seqcst,
+        typedef cc::MichaelHashMap< cds::gc::DHP, LazyList_DHP_less_stdAlloc_seqcst,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelMap_Lazy_PTB_less_stdAlloc_seqcst;
+        >   MichaelMap_Lazy_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_less_michaelAlloc,
+        typedef cc::MichaelHashMap< cds::gc::DHP, LazyList_DHP_less_michaelAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelMap_Lazy_PTB_less_michaelAlloc;
+        >   MichaelMap_Lazy_DHP_less_michaelAlloc;
 
         // RCU
         typedef cc::MichaelHashMap< rcu_gpi, LazyList_RCU_GPI_cmp_stdAlloc,
@@ -1730,8 +1730,8 @@ namespace map2 {
         {};
         typedef cc::SplitListMap< cds::gc::HP, Key, Value, traits_SplitList_Michael_HP_st_less_seqcst > SplitList_Michael_HP_st_less_seqcst;
 
-        // PTB
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        // DHP
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1741,9 +1741,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_cmp;
+        > SplitList_Michael_DHP_dyn_cmp;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1755,9 +1755,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_cmp_seqcst;
+        > SplitList_Michael_DHP_dyn_cmp_seqcst;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -1768,9 +1768,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_cmp;
+        > SplitList_Michael_DHP_st_cmp;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1783,10 +1783,10 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_cmp_seqcst;
+        > SplitList_Michael_DHP_st_cmp_seqcst;
 
-        // PTB + less
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        // DHP + less
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1796,9 +1796,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_less;
+        > SplitList_Michael_DHP_dyn_less;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1810,9 +1810,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_less_seqcst;
+        > SplitList_Michael_DHP_dyn_less_seqcst;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -1823,9 +1823,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_less;
+        > SplitList_Michael_DHP_st_less;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1838,7 +1838,7 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_less_seqcst;
+        > SplitList_Michael_DHP_st_less_seqcst;
 
         // RCU
         typedef cc::SplitListMap< rcu_gpi, Key, Value,
@@ -2616,8 +2616,8 @@ namespace map2 {
             >::type
         > SplitList_Lazy_HP_st_less_seqcst;
 
-        // PTB
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        // DHP
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2627,9 +2627,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_cmp;
+        > SplitList_Lazy_DHP_dyn_cmp;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2641,9 +2641,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_cmp_seqcst;
+        > SplitList_Lazy_DHP_dyn_cmp_seqcst;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -2654,9 +2654,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_cmp;
+        > SplitList_Lazy_DHP_st_cmp;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2669,10 +2669,10 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_cmp_seqcst;
+        > SplitList_Lazy_DHP_st_cmp_seqcst;
 
-        // PTB + less
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        // DHP + less
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2682,9 +2682,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_less;
+        > SplitList_Lazy_DHP_dyn_less;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2696,9 +2696,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_less_seqcst;
+        > SplitList_Lazy_DHP_dyn_less_seqcst;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -2709,9 +2709,9 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_less;
+        > SplitList_Lazy_DHP_st_less;
 
-        typedef cc::SplitListMap< cds::gc::PTB, Key, Value,
+        typedef cc::SplitListMap< cds::gc::DHP, Key, Value,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2724,7 +2724,7 @@ namespace map2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_less_seqcst;
+        > SplitList_Lazy_DHP_st_less_seqcst;
 
         // RCU
         typedef cc::SplitListMap< rcu_gpi, Key, Value,
@@ -3843,7 +3843,7 @@ namespace map2 {
         typedef cc::SkipListMap< cds::gc::HP, Key, Value, traits_SkipListMap_hp_cmp_xorshift_stat > SkipListMap_hp_cmp_xorshift_stat;
 
         // ***************************************************************************
-        // SkipListMap - PTB
+        // SkipListMap - DHP
 
         class traits_SkipListMap_ptb_less_pascal: public cc::skip_list::make_traits <
                 co::less< less >
@@ -3851,7 +3851,7 @@ namespace map2 {
                 ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_less_pascal > SkipListMap_ptb_less_pascal;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_less_pascal > SkipListMap_ptb_less_pascal;
 
         class traits_SkipListMap_ptb_less_pascal_seqcst: public cc::skip_list::make_traits <
                 co::less< less >
@@ -3860,7 +3860,7 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_less_pascal_seqcst > SkipListMap_ptb_less_pascal_seqcst;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_less_pascal_seqcst > SkipListMap_ptb_less_pascal_seqcst;
 
         class traits_SkipListMap_ptb_less_pascal_stat: public cc::skip_list::make_traits <
                 co::less< less >
@@ -3869,7 +3869,7 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_less_pascal_stat > SkipListMap_ptb_less_pascal_stat;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_less_pascal_stat > SkipListMap_ptb_less_pascal_stat;
 
         class traits_SkipListMap_ptb_cmp_pascal: public cc::skip_list::make_traits <
                 co::compare< compare >
@@ -3877,7 +3877,7 @@ namespace map2 {
                 ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_cmp_pascal > SkipListMap_ptb_cmp_pascal;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_cmp_pascal > SkipListMap_ptb_cmp_pascal;
 
         class traits_SkipListMap_ptb_cmp_pascal_stat: public cc::skip_list::make_traits <
                 co::compare< compare >
@@ -3886,7 +3886,7 @@ namespace map2 {
                 ,co::stat< cc::skip_list::stat<> >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_cmp_pascal_stat > SkipListMap_ptb_cmp_pascal_stat;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_cmp_pascal_stat > SkipListMap_ptb_cmp_pascal_stat;
 
         class traits_SkipListMap_ptb_less_xorshift: public cc::skip_list::make_traits <
                 co::less< less >
@@ -3894,7 +3894,7 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_less_xorshift > SkipListMap_ptb_less_xorshift;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_less_xorshift > SkipListMap_ptb_less_xorshift;
 
         class traits_SkipListMap_ptb_less_xorshift_stat: public cc::skip_list::make_traits <
                 co::less< less >
@@ -3903,7 +3903,7 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_less_xorshift_stat > SkipListMap_ptb_less_xorshift_stat;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_less_xorshift_stat > SkipListMap_ptb_less_xorshift_stat;
 
         class traits_SkipListMap_ptb_cmp_xorshift: public cc::skip_list::make_traits <
                 co::compare< compare >
@@ -3911,7 +3911,7 @@ namespace map2 {
                 ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_cmp_xorshift > SkipListMap_ptb_cmp_xorshift;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_cmp_xorshift > SkipListMap_ptb_cmp_xorshift;
 
         class traits_SkipListMap_ptb_cmp_xorshift_stat: public cc::skip_list::make_traits <
                 co::compare< compare >
@@ -3920,7 +3920,7 @@ namespace map2 {
                 ,co::stat< cc::skip_list::stat<> >
             >::type
         {};
-        typedef cc::SkipListMap< cds::gc::PTB, Key, Value, traits_SkipListMap_ptb_cmp_xorshift_stat > SkipListMap_ptb_cmp_xorshift_stat;
+        typedef cc::SkipListMap< cds::gc::DHP, Key, Value, traits_SkipListMap_ptb_cmp_xorshift_stat > SkipListMap_ptb_cmp_xorshift_stat;
 
         // ***************************************************************************
         // SkipListMap< gc::nogc >
@@ -4432,7 +4432,7 @@ namespace map2 {
                 typedef cc::ellen_bintree::update_desc< leaf_node, internal_node >  update_desc;
             };
             struct ptb_gc {
-                typedef cc::ellen_bintree::map_node<cds::gc::PTB, Key, Value>       leaf_node;
+                typedef cc::ellen_bintree::map_node<cds::gc::DHP, Key, Value>       leaf_node;
                 typedef cc::ellen_bintree::internal_node< Key, leaf_node >          internal_node;
                 typedef cc::ellen_bintree::update_desc< leaf_node, internal_node >  update_desc;
             };
@@ -4493,7 +4493,7 @@ namespace map2 {
         typedef cc::EllenBinTreeMap< cds::gc::HP, Key, Value, traits_EllenBinTreeMap_hp_stat > EllenBinTreeMap_hp_stat;
 
         // ***************************************************************************
-        // EllenBinTreeMap - PTB
+        // EllenBinTreeMap - DHP
 
         struct traits_EllenBinTreeMap_ptb: public cc::ellen_bintree::make_set_traits<
                 co::less< less >
@@ -4504,7 +4504,7 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef cc::EllenBinTreeMap< cds::gc::PTB, Key, Value, traits_EllenBinTreeMap_ptb> EllenBinTreeMap_ptb;
+        typedef cc::EllenBinTreeMap< cds::gc::DHP, Key, Value, traits_EllenBinTreeMap_ptb> EllenBinTreeMap_ptb;
 
         struct traits_EllenBinTreeMap_ptb_stat: public cc::ellen_bintree::make_set_traits<
                 co::less< less >
@@ -4516,7 +4516,7 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef cc::EllenBinTreeMap< cds::gc::PTB, Key, Value, traits_EllenBinTreeMap_ptb_stat > EllenBinTreeMap_ptb_stat;
+        typedef cc::EllenBinTreeMap< cds::gc::DHP, Key, Value, traits_EllenBinTreeMap_ptb_stat > EllenBinTreeMap_ptb_stat;
 
         // ***************************************************************************
         // EllenBinTreeMap - RCU

diff --git a/tests/unit/pqueue/pqueue_defs.h b/tests/unit/pqueue/pqueue_defs.h
index 5320d3862f0c30360be12eedbc9d39fab0947503..405a124ff91a4aa081ef62ce16ecde99ba2e1734 100644 (file)
--- a/tests/unit/pqueue/pqueue_defs.h
+++ b/tests/unit/pqueue/pqueue_defs.h
@@ -54,8 +54,8 @@
     TEST_CASE(EllenBinTree_HP_max_stat)     \
     TEST_CASE(EllenBinTree_HP_min)          \
     TEST_CASE(EllenBinTree_HP_min_stat)     \
-    TEST_CASE(EllenBinTree_PTB_max)         \
-    TEST_CASE(EllenBinTree_PTB_min)         \
+    TEST_CASE(EllenBinTree_DHP_max)         \
+    TEST_CASE(EllenBinTree_DHP_min)         \
     TEST_CASE(EllenBinTree_RCU_gpi_max)     \
     TEST_CASE(EllenBinTree_RCU_gpi_max_stat)     \
     TEST_CASE(EllenBinTree_RCU_gpi_min)     \
@@ -74,8 +74,8 @@
     CPPUNIT_TEST(EllenBinTree_HP_max_stat)  \
     CPPUNIT_TEST(EllenBinTree_HP_min)       \
     CPPUNIT_TEST(EllenBinTree_HP_min_stat)  \
-    CPPUNIT_TEST(EllenBinTree_PTB_max)      \
-    CPPUNIT_TEST(EllenBinTree_PTB_min)      \
+    CPPUNIT_TEST(EllenBinTree_DHP_max)      \
+    CPPUNIT_TEST(EllenBinTree_DHP_min)      \
     /*CPPUNIT_TEST(EllenBinTree_RCU_gpi_max)*/  \
     /*CPPUNIT_TEST(EllenBinTree_RCU_gpi_max_stat)*/  \
     /*CPPUNIT_TEST(EllenBinTree_RCU_gpi_min)*/  \
@@ -115,8 +115,8 @@
     TEST_CASE(SkipList_HP_min_stat)     \
     TEST_CASE(SkipList_HRC_max)         \
     TEST_CASE(SkipList_HRC_min)         \
-    TEST_CASE(SkipList_PTB_max)         \
-    TEST_CASE(SkipList_PTB_min)         \
+    TEST_CASE(SkipList_DHP_max)         \
+    TEST_CASE(SkipList_DHP_min)         \
     TEST_CASE(SkipList_RCU_gpi_max)     \
     TEST_CASE(SkipList_RCU_gpi_min)     \
     TEST_CASE(SkipList_RCU_gpb_max)     \
@@ -131,8 +131,8 @@
     CPPUNIT_TEST(SkipList_HP_min_stat)  \
     /*CPPUNIT_TEST(SkipList_HRC_max)*/      \
     /*CPPUNIT_TEST(SkipList_HRC_min)*/      \
-    CPPUNIT_TEST(SkipList_PTB_max)      \
-    CPPUNIT_TEST(SkipList_PTB_min)      \
+    CPPUNIT_TEST(SkipList_DHP_max)      \
+    CPPUNIT_TEST(SkipList_DHP_min)      \
     CPPUNIT_TEST(SkipList_RCU_gpi_max)  \
     CPPUNIT_TEST(SkipList_RCU_gpi_min)  \
     CPPUNIT_TEST(SkipList_RCU_gpb_max)  \

diff --git a/tests/unit/pqueue/pqueue_type.h b/tests/unit/pqueue/pqueue_type.h
index 30fad33c073f6a3fae8a18531adf6e7b56b90db1..c5db84a9cf7884676154d35f75e8fe1d6e567519 100644 (file)
--- a/tests/unit/pqueue/pqueue_type.h
+++ b/tests/unit/pqueue/pqueue_type.h
@@ -133,19 +133,19 @@ namespace pqueue {
             >::type, false
         > EllenBinTree_HP_min_stat;
 
-        typedef EllenBinTreePQueue< cds::gc::PTB, typename Value::key_type, Value,
+        typedef EllenBinTreePQueue< cds::gc::DHP, typename Value::key_type, Value,
             typename cc::ellen_bintree::make_set_traits<
                 cc::ellen_bintree::key_extractor< typename Value::key_extractor >
                 ,cc::opt::less< std::less<Value> >
             >::type
-        > EllenBinTree_PTB_max;
+        > EllenBinTree_DHP_max;
 
-        typedef EllenBinTreePQueue< cds::gc::PTB, typename Value::key_type, Value,
+        typedef EllenBinTreePQueue< cds::gc::DHP, typename Value::key_type, Value,
             typename cc::ellen_bintree::make_set_traits<
                 cc::ellen_bintree::key_extractor< typename Value::key_extractor >
                 ,cc::opt::less< std::greater<Value> >
             >::type, false
-        > EllenBinTree_PTB_min;
+        > EllenBinTree_DHP_min;
 
         typedef EllenBinTreePQueue< cds::urcu::gc< cds::urcu::general_instant<> >, typename Value::key_type, Value,
             typename cc::ellen_bintree::make_set_traits<
@@ -338,17 +338,17 @@ namespace pqueue {
             >::type, false
         > SkipList_HRC_min;
 
-        typedef SkipListPQueue< cds::gc::PTB, Value,
+        typedef SkipListPQueue< cds::gc::DHP, Value,
             typename cc::skip_list::make_traits<
                 cc::opt::less< std::less<Value> >
             >::type
-        > SkipList_PTB_max;
+        > SkipList_DHP_max;
 
-        typedef SkipListPQueue< cds::gc::PTB, Value,
+        typedef SkipListPQueue< cds::gc::DHP, Value,
             typename cc::skip_list::make_traits<
                 cc::opt::less< std::greater<Value> >
             >::type, false
-        > SkipList_PTB_min;
+        > SkipList_DHP_min;
 
         typedef SkipListPQueue< cds::urcu::gc< cds::urcu::general_instant<> >, Value,
             typename cc::skip_list::make_traits<

diff --git a/tests/unit/queue/queue_defs.h b/tests/unit/queue/queue_defs.h
index febb7fa1fd220befb9b4ee1671af252b2c6b1481..0ea6863d78c90ad385ba2da3361acfefd34e8e74 100644 (file)
--- a/tests/unit/queue/queue_defs.h
+++ b/tests/unit/queue/queue_defs.h
@@ -206,20 +206,20 @@
     TEST_SEGMENTED( SegmentedQueue_HP_spin_stat, ITEM_TYPE ) \
     TEST_SEGMENTED( SegmentedQueue_HP_mutex, ITEM_TYPE ) \
     TEST_SEGMENTED( SegmentedQueue_HP_mutex_stat, ITEM_TYPE ) \
-    TEST_SEGMENTED( SegmentedQueue_PTB_spin, ITEM_TYPE ) \
-    TEST_SEGMENTED( SegmentedQueue_PTB_spin_stat, ITEM_TYPE ) \
-    TEST_SEGMENTED( SegmentedQueue_PTB_mutex, ITEM_TYPE ) \
-    TEST_SEGMENTED( SegmentedQueue_PTB_mutex_stat, ITEM_TYPE )
+    TEST_SEGMENTED( SegmentedQueue_DHP_spin, ITEM_TYPE ) \
+    TEST_SEGMENTED( SegmentedQueue_DHP_spin_stat, ITEM_TYPE ) \
+    TEST_SEGMENTED( SegmentedQueue_DHP_mutex, ITEM_TYPE ) \
+    TEST_SEGMENTED( SegmentedQueue_DHP_mutex_stat, ITEM_TYPE )
 
 #define CDSUNIT_TEST_SegmentedQueue \
     CPPUNIT_TEST( SegmentedQueue_HP_spin ) \
     CPPUNIT_TEST( SegmentedQueue_HP_spin_stat ) \
     CPPUNIT_TEST( SegmentedQueue_HP_mutex ) \
     CPPUNIT_TEST( SegmentedQueue_HP_mutex_stat ) \
-    CPPUNIT_TEST( SegmentedQueue_PTB_spin ) \
-    CPPUNIT_TEST( SegmentedQueue_PTB_spin_stat ) \
-    CPPUNIT_TEST( SegmentedQueue_PTB_mutex ) \
-    CPPUNIT_TEST( SegmentedQueue_PTB_mutex_stat )
+    CPPUNIT_TEST( SegmentedQueue_DHP_spin ) \
+    CPPUNIT_TEST( SegmentedQueue_DHP_spin_stat ) \
+    CPPUNIT_TEST( SegmentedQueue_DHP_mutex ) \
+    CPPUNIT_TEST( SegmentedQueue_DHP_mutex_stat )
 
 
 // std::queue

diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h
index 217a6bf4f38cd77803e47795f5ff6d0c6dec806c..7e6050ca1abb1fa4993651d28ecbfe7ae7c346d2 100644 (file)
--- a/tests/unit/queue/queue_type.h
+++ b/tests/unit/queue/queue_type.h
@@ -485,10 +485,10 @@ namespace queue {
         typedef cds::container::SegmentedQueue< cds::gc::HP, Value, traits_SegmentedQueue_mutex >  SegmentedQueue_HP_mutex;
         typedef cds::container::SegmentedQueue< cds::gc::HP, Value, traits_SegmentedQueue_mutex_stat >  SegmentedQueue_HP_mutex_stat;
 
-        typedef cds::container::SegmentedQueue< cds::gc::PTB, Value >  SegmentedQueue_PTB_spin;
-        typedef cds::container::SegmentedQueue< cds::gc::PTB, Value, traits_SegmentedQueue_spin_stat >  SegmentedQueue_PTB_spin_stat;
-        typedef cds::container::SegmentedQueue< cds::gc::PTB, Value, traits_SegmentedQueue_mutex >  SegmentedQueue_PTB_mutex;
-        typedef cds::container::SegmentedQueue< cds::gc::PTB, Value, traits_SegmentedQueue_mutex_stat >  SegmentedQueue_PTB_mutex_stat;
+        typedef cds::container::SegmentedQueue< cds::gc::DHP, Value >  SegmentedQueue_DHP_spin;
+        typedef cds::container::SegmentedQueue< cds::gc::DHP, Value, traits_SegmentedQueue_spin_stat >  SegmentedQueue_DHP_spin_stat;
+        typedef cds::container::SegmentedQueue< cds::gc::DHP, Value, traits_SegmentedQueue_mutex >  SegmentedQueue_DHP_mutex;
+        typedef cds::container::SegmentedQueue< cds::gc::DHP, Value, traits_SegmentedQueue_mutex_stat >  SegmentedQueue_DHP_mutex_stat;
 
 
     };

diff --git a/tests/unit/set2/set_defs.h b/tests/unit/set2/set_defs.h
index e5af4a4c68fd7c0626525c6754f5e6a4af458b41..15bf480e27f03b87efeeea25738f85811915012a 100644 (file)
--- a/tests/unit/set2/set_defs.h
+++ b/tests/unit/set2/set_defs.h
@@ -39,8 +39,8 @@
 #define CDSUNIT_DECLARE_MichaelSet  \
     TEST_SET_EXTRACT(MichaelSet_HP_cmp_stdAlloc) \
     TEST_SET_EXTRACT(MichaelSet_HP_less_michaelAlloc) \
-    TEST_SET_EXTRACT(MichaelSet_PTB_cmp_stdAlloc) \
-    TEST_SET_EXTRACT(MichaelSet_PTB_less_michaelAlloc) \
+    TEST_SET_EXTRACT(MichaelSet_DHP_cmp_stdAlloc) \
+    TEST_SET_EXTRACT(MichaelSet_DHP_less_michaelAlloc) \
     TEST_SET_EXTRACT(MichaelSet_RCU_GPI_cmp_stdAlloc) \
     TEST_SET_EXTRACT(MichaelSet_RCU_GPI_less_michaelAlloc) \
     TEST_SET_EXTRACT(MichaelSet_RCU_GPB_cmp_stdAlloc) \
@@ -49,8 +49,8 @@
     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_PTB_cmp_stdAlloc) \
-    TEST_SET_EXTRACT(MichaelSet_Lazy_PTB_less_michaelAlloc) \
+    TEST_SET_EXTRACT(MichaelSet_Lazy_DHP_cmp_stdAlloc) \
+    TEST_SET_EXTRACT(MichaelSet_Lazy_DHP_less_michaelAlloc) \
     TEST_SET_EXTRACT(MichaelSet_Lazy_RCU_GPI_cmp_stdAlloc) \
     TEST_SET_EXTRACT(MichaelSet_Lazy_RCU_GPI_less_michaelAlloc) \
     TEST_SET_EXTRACT(MichaelSet_Lazy_RCU_GPB_cmp_stdAlloc) \
@@ -62,8 +62,8 @@
 #define CDSUNIT_TEST_MichaelSet  \
     CPPUNIT_TEST(MichaelSet_HP_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelSet_HP_less_michaelAlloc) \
-    CPPUNIT_TEST(MichaelSet_PTB_cmp_stdAlloc) \
-    CPPUNIT_TEST(MichaelSet_PTB_less_michaelAlloc) \
+    CPPUNIT_TEST(MichaelSet_DHP_cmp_stdAlloc) \
+    CPPUNIT_TEST(MichaelSet_DHP_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelSet_RCU_GPI_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelSet_RCU_GPI_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelSet_RCU_GPB_cmp_stdAlloc) \
@@ -72,8 +72,8 @@
     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_PTB_cmp_stdAlloc) \
-    CPPUNIT_TEST(MichaelSet_Lazy_PTB_less_michaelAlloc) \
+    CPPUNIT_TEST(MichaelSet_Lazy_DHP_cmp_stdAlloc) \
+    CPPUNIT_TEST(MichaelSet_Lazy_DHP_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelSet_Lazy_RCU_GPI_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelSet_Lazy_RCU_GPI_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelSet_Lazy_RCU_GPB_cmp_stdAlloc) \
@@ -130,10 +130,10 @@
     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_PTB_dyn_cmp)\
-    TEST_SET_EXTRACT(SplitList_Michael_PTB_st_cmp)\
-    TEST_SET_EXTRACT(SplitList_Michael_PTB_dyn_less)\
-    TEST_SET_EXTRACT(SplitList_Michael_PTB_st_less)\
+    TEST_SET_EXTRACT(SplitList_Michael_DHP_dyn_cmp)\
+    TEST_SET_EXTRACT(SplitList_Michael_DHP_st_cmp)\
+    TEST_SET_EXTRACT(SplitList_Michael_DHP_dyn_less)\
+    TEST_SET_EXTRACT(SplitList_Michael_DHP_st_less)\
     TEST_SET_EXTRACT(SplitList_Michael_RCU_GPI_dyn_cmp)\
     TEST_SET_EXTRACT(SplitList_Michael_RCU_GPI_st_cmp)\
     TEST_SET_EXTRACT(SplitList_Michael_RCU_GPI_dyn_less)\
@@ -150,10 +150,10 @@
     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_PTB_dyn_cmp)\
-    TEST_SET_EXTRACT(SplitList_Lazy_PTB_st_cmp)\
-    TEST_SET_EXTRACT(SplitList_Lazy_PTB_dyn_less)\
-    TEST_SET_EXTRACT(SplitList_Lazy_PTB_st_less)\
+    TEST_SET_EXTRACT(SplitList_Lazy_DHP_dyn_cmp)\
+    TEST_SET_EXTRACT(SplitList_Lazy_DHP_st_cmp)\
+    TEST_SET_EXTRACT(SplitList_Lazy_DHP_dyn_less)\
+    TEST_SET_EXTRACT(SplitList_Lazy_DHP_st_less)\
     TEST_SET_EXTRACT(SplitList_Lazy_RCU_GPI_dyn_cmp)\
     TEST_SET_EXTRACT(SplitList_Lazy_RCU_GPI_st_cmp)\
     TEST_SET_EXTRACT(SplitList_Lazy_RCU_GPI_dyn_less)\
@@ -173,10 +173,10 @@
     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_PTB_dyn_cmp)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_st_cmp)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_dyn_less)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_st_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_dyn_less)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_st_less)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_dyn_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_dyn_less)\
@@ -193,10 +193,10 @@
     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_PTB_dyn_cmp)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_st_cmp)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_less)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_st_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_dyn_less)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_st_less)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_dyn_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_dyn_less)\

diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h
index 36800dd5950371933308baef5744bdf8ed85ddfb..88304a24a4a840ba78c4bba0eb90ba0670b682b4 100644 (file)
--- a/tests/unit/set2/set_types.h
+++ b/tests/unit/set2/set_types.h
@@ -349,45 +349,45 @@ namespace set2 {
             >::type
         >   MichaelList_HP_less_michaelAlloc;
 
-        typedef cc::MichaelList< cds::gc::PTB, key_val,
+        typedef cc::MichaelList< cds::gc::DHP, key_val,
             typename cc::michael_list::make_traits<
                 co::compare< compare >
             >::type
-        >   MichaelList_PTB_cmp_stdAlloc;
+        >   MichaelList_DHP_cmp_stdAlloc;
 
-        typedef cc::MichaelList< cds::gc::PTB, key_val,
+        typedef cc::MichaelList< cds::gc::DHP, key_val,
             typename cc::michael_list::make_traits<
                 co::compare< compare >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   MichaelList_PTB_cmp_stdAlloc_seqcst;
+        >   MichaelList_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelList< cds::gc::PTB, key_val,
+        typedef cc::MichaelList< cds::gc::DHP, key_val,
             typename cc::michael_list::make_traits<
                 co::compare< compare >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelList_PTB_cmp_michaelAlloc;
+        >   MichaelList_DHP_cmp_michaelAlloc;
 
-        typedef cc::MichaelList< cds::gc::PTB, key_val,
+        typedef cc::MichaelList< cds::gc::DHP, key_val,
             typename cc::michael_list::make_traits<
                 co::less< less >
             >::type
-        >   MichaelList_PTB_less_stdAlloc;
+        >   MichaelList_DHP_less_stdAlloc;
 
-        typedef cc::MichaelList< cds::gc::PTB, key_val,
+        typedef cc::MichaelList< cds::gc::DHP, key_val,
             typename cc::michael_list::make_traits<
                 co::less< less >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   MichaelList_PTB_less_stdAlloc_seqcst;
+        >   MichaelList_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelList< cds::gc::PTB, key_val,
+        typedef cc::MichaelList< cds::gc::DHP, key_val,
             typename cc::michael_list::make_traits<
                 co::less< less >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelList_PTB_less_michaelAlloc;
+        >   MichaelList_DHP_less_michaelAlloc;
 
 
         typedef cc::MichaelList< rcu_gpi, key_val,
@@ -636,43 +636,43 @@ namespace set2 {
             >::type
         >   MichaelSet_HP_less_michaelAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, MichaelList_PTB_cmp_stdAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, MichaelList_DHP_cmp_stdAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_PTB_cmp_stdAlloc;
+        >   MichaelSet_DHP_cmp_stdAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, MichaelList_PTB_cmp_stdAlloc_seqcst,
+        typedef cc::MichaelHashSet< cds::gc::DHP, MichaelList_DHP_cmp_stdAlloc_seqcst,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_PTB_cmp_stdAlloc_seqcst;
+        >   MichaelSet_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, MichaelList_PTB_cmp_michaelAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, MichaelList_DHP_cmp_michaelAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelSet_PTB_cmp_michaelAlloc;
+        >   MichaelSet_DHP_cmp_michaelAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, MichaelList_PTB_less_stdAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, MichaelList_DHP_less_stdAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_PTB_less_stdAlloc;
+        >   MichaelSet_DHP_less_stdAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, MichaelList_PTB_less_stdAlloc_seqcst,
+        typedef cc::MichaelHashSet< cds::gc::DHP, MichaelList_DHP_less_stdAlloc_seqcst,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_PTB_less_stdAlloc_seqcst;
+        >   MichaelSet_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, MichaelList_PTB_less_michaelAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, MichaelList_DHP_less_michaelAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelSet_PTB_less_michaelAlloc;
+        >   MichaelSet_DHP_less_michaelAlloc;
 
         // general_instant RCU
         typedef cc::MichaelHashSet< rcu_gpi, MichaelList_RCU_GPI_cmp_stdAlloc,
@@ -1202,43 +1202,43 @@ namespace set2 {
             >::type
         >   MichaelSet_Lazy_HP_less_michaelAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, LazyList_DHP_cmp_stdAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_Lazy_PTB_cmp_stdAlloc;
+        >   MichaelSet_Lazy_DHP_cmp_stdAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc_seqcst,
+        typedef cc::MichaelHashSet< cds::gc::DHP, LazyList_DHP_cmp_stdAlloc_seqcst,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_Lazy_PTB_cmp_stdAlloc_seqcst;
+        >   MichaelSet_Lazy_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_cmp_michaelAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, LazyList_DHP_cmp_michaelAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelSet_Lazy_PTB_cmp_michaelAlloc;
+        >   MichaelSet_Lazy_DHP_cmp_michaelAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_less_stdAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, LazyList_DHP_less_stdAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_Lazy_PTB_less_stdAlloc;
+        >   MichaelSet_Lazy_DHP_less_stdAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_less_stdAlloc_seqcst,
+        typedef cc::MichaelHashSet< cds::gc::DHP, LazyList_DHP_less_stdAlloc_seqcst,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
-        >   MichaelSet_Lazy_PTB_less_stdAlloc_seqcst;
+        >   MichaelSet_Lazy_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_less_michaelAlloc,
+        typedef cc::MichaelHashSet< cds::gc::DHP, LazyList_DHP_less_michaelAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   MichaelSet_Lazy_PTB_less_michaelAlloc;
+        >   MichaelSet_Lazy_DHP_less_michaelAlloc;
 
         // RCU
         typedef cc::MichaelHashSet< rcu_gpi, LazyList_RCU_GPI_cmp_stdAlloc,
@@ -1549,8 +1549,8 @@ namespace set2 {
             >::type
         > SplitList_Michael_HP_st_less_seqcst;
 
-        // PTB
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        // DHP
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1560,9 +1560,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_cmp;
+        > SplitList_Michael_DHP_dyn_cmp;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1574,9 +1574,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_cmp_seqcst;
+        > SplitList_Michael_DHP_dyn_cmp_seqcst;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -1587,9 +1587,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_cmp;
+        > SplitList_Michael_DHP_st_cmp;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1602,10 +1602,10 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_cmp_seqcst;
+        > SplitList_Michael_DHP_st_cmp_seqcst;
 
-        // PTB + less
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        // DHP + less
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1615,9 +1615,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_less;
+        > SplitList_Michael_DHP_dyn_less;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1629,9 +1629,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_dyn_less_seqcst;
+        > SplitList_Michael_DHP_dyn_less_seqcst;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -1642,9 +1642,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_less;
+        > SplitList_Michael_DHP_st_less;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::michael_list_tag>
                 ,co::hash< hash >
@@ -1657,7 +1657,7 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Michael_PTB_st_less_seqcst;
+        > SplitList_Michael_DHP_st_less_seqcst;
 
         // RCU
         typedef cc::SplitListSet< rcu_gpi, key_val,
@@ -2325,8 +2325,8 @@ namespace set2 {
             >::type
         > SplitList_Lazy_HP_st_less_seqcst;
 
-        // PTB
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        // DHP
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2336,9 +2336,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_cmp;
+        > SplitList_Lazy_DHP_dyn_cmp;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2350,9 +2350,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_cmp_seqcst;
+        > SplitList_Lazy_DHP_dyn_cmp_seqcst;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -2363,9 +2363,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_cmp;
+        > SplitList_Lazy_DHP_st_cmp;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2378,10 +2378,10 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_cmp_seqcst;
+        > SplitList_Lazy_DHP_st_cmp_seqcst;
 
-        // PTB + less
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        // DHP + less
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2391,9 +2391,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_less;
+        > SplitList_Lazy_DHP_dyn_less;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2405,9 +2405,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_dyn_less_seqcst;
+        > SplitList_Lazy_DHP_dyn_less_seqcst;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,cc::split_list::dynamic_bucket_table< false >
@@ -2418,9 +2418,9 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_less;
+        > SplitList_Lazy_DHP_st_less;
 
-        typedef cc::SplitListSet< cds::gc::PTB, key_val,
+        typedef cc::SplitListSet< cds::gc::DHP, key_val,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list<cc::lazy_list_tag>
                 ,co::hash< hash >
@@ -2433,7 +2433,7 @@ namespace set2 {
                     >::type
                 >
             >::type
-        > SplitList_Lazy_PTB_st_less_seqcst;
+        > SplitList_Lazy_DHP_st_less_seqcst;
 
 
         // RCU
@@ -3502,7 +3502,7 @@ namespace set2 {
         typedef cc::SkipListSet< cds::gc::HP, key_val, traits_SkipListSet_hp_cmp_xorshift_stat > SkipListSet_hp_cmp_xorshift_stat;
 
         // ***************************************************************************
-        // SkipListSet - PTB
+        // SkipListSet - DHP
 
         class traits_SkipListSet_ptb_less_pascal: public cc::skip_list::make_traits <
             co::less< less >
@@ -3510,7 +3510,7 @@ namespace set2 {
             ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_less_pascal > SkipListSet_ptb_less_pascal;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_less_pascal > SkipListSet_ptb_less_pascal;
 
         class traits_SkipListSet_ptb_less_pascal_seqcst: public cc::skip_list::make_traits <
             co::less< less >
@@ -3519,7 +3519,7 @@ namespace set2 {
             ,co::item_counter< cds::atomicity::item_counter >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_less_pascal_seqcst > SkipListSet_ptb_less_pascal_seqcst;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_less_pascal_seqcst > SkipListSet_ptb_less_pascal_seqcst;
 
         class traits_SkipListSet_ptb_less_pascal_stat: public cc::skip_list::make_traits <
             co::less< less >
@@ -3528,7 +3528,7 @@ namespace set2 {
             ,co::item_counter< cds::atomicity::item_counter >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_less_pascal_stat > SkipListSet_ptb_less_pascal_stat;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_less_pascal_stat > SkipListSet_ptb_less_pascal_stat;
 
         class traits_SkipListSet_ptb_cmp_pascal: public cc::skip_list::make_traits <
             co::compare< compare >
@@ -3536,7 +3536,7 @@ namespace set2 {
             ,co::item_counter< cds::atomicity::item_counter >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_cmp_pascal > SkipListSet_ptb_cmp_pascal;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_cmp_pascal > SkipListSet_ptb_cmp_pascal;
 
         class traits_SkipListSet_ptb_cmp_pascal_stat: public cc::skip_list::make_traits <
             co::compare< compare >
@@ -3545,7 +3545,7 @@ namespace set2 {
             ,co::item_counter< cds::atomicity::item_counter >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_cmp_pascal_stat > SkipListSet_ptb_cmp_pascal_stat;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_cmp_pascal_stat > SkipListSet_ptb_cmp_pascal_stat;
 
         class traits_SkipListSet_ptb_less_xorshift: public cc::skip_list::make_traits <
             co::less< less >
@@ -3553,7 +3553,7 @@ namespace set2 {
             ,co::item_counter< cds::atomicity::item_counter >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_less_xorshift > SkipListSet_ptb_less_xorshift;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_less_xorshift > SkipListSet_ptb_less_xorshift;
 
         class traits_SkipListSet_ptb_less_xorshift_stat: public cc::skip_list::make_traits <
             co::less< less >
@@ -3562,7 +3562,7 @@ namespace set2 {
             ,co::stat< cc::skip_list::stat<> >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_less_xorshift_stat > SkipListSet_ptb_less_xorshift_stat;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_less_xorshift_stat > SkipListSet_ptb_less_xorshift_stat;
 
         class traits_SkipListSet_ptb_cmp_xorshift: public cc::skip_list::make_traits <
             co::compare< compare >
@@ -3570,7 +3570,7 @@ namespace set2 {
             ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_cmp_xorshift> SkipListSet_ptb_cmp_xorshift;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_cmp_xorshift> SkipListSet_ptb_cmp_xorshift;
 
         class traits_SkipListSet_ptb_cmp_xorshift_stat: public cc::skip_list::make_traits <
             co::compare< compare >
@@ -3579,7 +3579,7 @@ namespace set2 {
             ,co::item_counter< cds::atomicity::item_counter >
         >::type
         {};
-        typedef cc::SkipListSet< cds::gc::PTB, key_val, traits_SkipListSet_ptb_cmp_xorshift_stat > SkipListSet_ptb_cmp_xorshift_stat;
+        typedef cc::SkipListSet< cds::gc::DHP, key_val, traits_SkipListSet_ptb_cmp_xorshift_stat > SkipListSet_ptb_cmp_xorshift_stat;
 
 
         // ***************************************************************************
@@ -4021,7 +4021,7 @@ namespace set2 {
             };
 
             struct ptb_gc {
-                typedef cc::ellen_bintree::node<cds::gc::PTB, key_val>              leaf_node;
+                typedef cc::ellen_bintree::node<cds::gc::DHP, key_val>              leaf_node;
                 typedef cc::ellen_bintree::internal_node< key_type, leaf_node >     internal_node;
                 typedef cc::ellen_bintree::update_desc< leaf_node, internal_node >  update_desc;
             };
@@ -4083,7 +4083,7 @@ namespace set2 {
         typedef cc::EllenBinTreeSet< cds::gc::HP, key_type, key_val, traits_EllenBinTreeSet_hp_stat > EllenBinTreeSet_hp_stat;
 
         // ***************************************************************************
-        // EllenBinTreeSet - PTB
+        // EllenBinTreeSet - DHP
 
         class traits_EllenBinTreeSet_ptb: public cc::ellen_bintree::make_set_traits<
             cc::ellen_bintree::key_extractor< typename ellen_bintree_props::key_extractor >
@@ -4094,7 +4094,7 @@ namespace set2 {
             ,co::node_allocator< ellen_bintree_pool::internal_node_allocator< int > >
         >::type
         {};
-        typedef cc::EllenBinTreeSet< cds::gc::PTB, key_type, key_val, traits_EllenBinTreeSet_ptb > EllenBinTreeSet_ptb;
+        typedef cc::EllenBinTreeSet< cds::gc::DHP, key_type, key_val, traits_EllenBinTreeSet_ptb > EllenBinTreeSet_ptb;
 
         class traits_EllenBinTreeSet_ptb_stat: public cc::ellen_bintree::make_set_traits<
             cc::ellen_bintree::key_extractor< typename ellen_bintree_props::key_extractor >
@@ -4106,7 +4106,7 @@ namespace set2 {
             ,co::stat< cc::ellen_bintree::stat<> >
         >::type
         {};
-        typedef cc::EllenBinTreeSet< cds::gc::PTB, key_type, key_val, traits_EllenBinTreeSet_ptb_stat > EllenBinTreeSet_ptb_stat;
+        typedef cc::EllenBinTreeSet< cds::gc::DHP, key_type, key_val, traits_EllenBinTreeSet_ptb_stat > EllenBinTreeSet_ptb_stat;
 
 
         // ***************************************************************************