SkipList: replace gc::PTB with gc::DHP

diff --git a/cds/container/impl/skip_list_map.h b/cds/container/impl/skip_list_map.h
index dac53ed552a339e21e70f5848aa00e407d3a4b03..303ea953133ef2a2c8244f4769d74522155f4d2d 100644 (file)
--- a/cds/container/impl/skip_list_map.h
+++ b/cds/container/impl/skip_list_map.h
@@ -62,8 +62,8 @@ namespace cds { namespace container {
             when you try to create skip-list object.
 
         \note There are several specializations of \p %SkipListMap for each \p GC. You should include:
-        - <tt><cds/container/skip_list_map_hp.h></tt> for gc::HP garbage collector
-        - <tt><cds/container/skip_list_map_ptb.h></tt> for gc::PTB garbage collector
+        - <tt><cds/container/skip_list_map_hp.h></tt> for \p gc::HP garbage collector
+        - <tt><cds/container/skip_list_map_dhp.h></tt> for \p gc::DHP garbage collector
         - <tt><cds/container/skip_list_map_rcu.h></tt> for \ref cds_nonintrusive_SkipListMap_rcu "RCU type"
         - <tt><cds/container/skip_list_map_nogc.h></tt> for \ref cds_nonintrusive_SkipListMap_nogc "non-deletable SkipListMap"
 

diff --git a/cds/container/impl/skip_list_set.h b/cds/container/impl/skip_list_set.h
index 33612c6ab6d0dbf665e6f78c344fc158d1c3b840..83252f804748d0bad532debadff97285da244c83 100644 (file)
--- a/cds/container/impl/skip_list_set.h
+++ b/cds/container/impl/skip_list_set.h
@@ -60,8 +60,8 @@ namespace cds { namespace container {
             when you try to create skip-list object.
 
         \note There are several specializations of \p %SkipListSet for each \p GC. You should include:
-        - <tt><cds/container/skip_list_set_hp.h></tt> for gc::HP garbage collector
-        - <tt><cds/container/skip_list_set_ptb.h></tt> for gc::PTB garbage collector
+        - <tt><cds/container/skip_list_set_hp.h></tt> for \p gc::HP garbage collector
+        - <tt><cds/container/skip_list_set_dhp.h></tt> for \p gc::DHP garbage collector
         - <tt><cds/container/skip_list_set_rcu.h></tt> for \ref cds_nonintrusive_SkipListSet_rcu "RCU type"
         - <tt><cds/container/skip_list_set_nogc.h></tt> for \ref cds_nonintrusive_SkipListSet_nogc "non-deletable SkipListSet"
 

diff --git a/cds/container/skip_list_map_dhp.h b/cds/container/skip_list_map_dhp.h
new file mode 100644 (file)
index 0000000..0050f9c
--- /dev/null
+++ b/cds/container/skip_list_map_dhp.h
@@ -0,0 +1,11 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_SKIP_LIST_SET_DHP_H
+#define __CDS_CONTAINER_SKIP_LIST_SET_DHP_H
+
+#include <cds/container/details/skip_list_base.h>
+#include <cds/intrusive/skip_list_dhp.h>
+#include <cds/container/details/make_skip_list_map.h>
+#include <cds/container/impl/skip_list_map.h>
+
+#endif  // #ifndef __CDS_CONTAINER_SKIP_LIST_SET_DHP_H

diff --git a/cds/container/skip_list_map_ptb.h b/cds/container/skip_list_map_ptb.h
deleted file mode 100644 (file)
index dd6dbb8..0000000
--- a/cds/container/skip_list_map_ptb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_SKIP_LIST_SET_PTB_H
-#define __CDS_CONTAINER_SKIP_LIST_SET_PTB_H
-
-#include <cds/container/details/skip_list_base.h>
-#include <cds/intrusive/skip_list_ptb.h>
-#include <cds/container/details/make_skip_list_map.h>
-#include <cds/container/impl/skip_list_map.h>
-
-#endif  // #ifndef __CDS_CONTAINER_SKIP_LIST_SET_PTB_H

diff --git a/cds/container/skip_list_set_dhp.h b/cds/container/skip_list_set_dhp.h
new file mode 100644 (file)
index 0000000..3e0d26e
--- /dev/null
+++ b/cds/container/skip_list_set_dhp.h
@@ -0,0 +1,11 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H
+#define __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H
+
+#include <cds/container/details/skip_list_base.h>
+#include <cds/intrusive/skip_list_dhp.h>
+#include <cds/container/details/make_skip_list_set.h>
+#include <cds/container/impl/skip_list_set.h>
+
+#endif  // #ifndef __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H

diff --git a/cds/container/skip_list_set_ptb.h b/cds/container/skip_list_set_ptb.h
deleted file mode 100644 (file)
index 99918c6..0000000
--- a/cds/container/skip_list_set_ptb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H
-#define __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H
-
-#include <cds/container/details/skip_list_base.h>
-#include <cds/intrusive/skip_list_ptb.h>
-#include <cds/container/details/make_skip_list_set.h>
-#include <cds/container/impl/skip_list_set.h>
-
-#endif  // #ifndef __CDS_CONTAINER_SKIP_LIST_MAP_PTB_H

diff --git a/cds/intrusive/impl/skip_list.h b/cds/intrusive/impl/skip_list.h
index ddce8e53465ca802ac512b0f249f568445532231..4a4c761e3c931a94cc5d23a69e85caaa25f8b461 100644 (file)
--- a/cds/intrusive/impl/skip_list.h
+++ b/cds/intrusive/impl/skip_list.h
@@ -215,8 +215,8 @@ namespace cds { namespace intrusive {
             when you try to create skip-list object.
 
         \note There are several specializations of \p %SkipListSet for each \p GC. You should include:
-        - <tt><cds/intrusive/skip_list_hp.h></tt> for gc::HP garbage collector
-        - <tt><cds/intrusive/skip_list_ptb.h></tt> for gc::PTB garbage collector
+        - <tt><cds/intrusive/skip_list_hp.h></tt> for \p gc::HP garbage collector
+        - <tt><cds/intrusive/skip_list_dhp.h></tt> for \p gc::DHP garbage collector
         - <tt><cds/intrusive/skip_list_nogc.h></tt> for \ref cds_intrusive_SkipListSet_nogc for persistent set
         - <tt><cds/intrusive/skip_list_rcu.h></tt> for \ref cds_intrusive_SkipListSet_rcu "RCU type"
 

diff --git a/cds/intrusive/skip_list_dhp.h b/cds/intrusive/skip_list_dhp.h
new file mode 100644 (file)
index 0000000..0153950
--- /dev/null
+++ b/cds/intrusive/skip_list_dhp.h
@@ -0,0 +1,9 @@
+//$$CDS-header$$
+
+#ifndef __CDS_INTRUSIVE_SKIP_LIST_DHP_H
+#define __CDS_INTRUSIVE_SKIP_LIST_DHP_H
+
+#include <cds/gc/dhp.h>
+#include <cds/intrusive/impl/skip_list.h>
+
+#endif // __CDS_INTRUSIVE_SKIP_LIST_DHP_H

diff --git a/cds/intrusive/skip_list_ptb.h b/cds/intrusive/skip_list_ptb.h
deleted file mode 100644 (file)
index 87a5f9a..0000000
--- a/cds/intrusive/skip_list_ptb.h
+++ /dev/null
@@ -1,9 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_INTRUSIVE_SKIP_LIST_PTB_H
-#define __CDS_INTRUSIVE_SKIP_LIST_PTB_H
-
-#include <cds/gc/ptb.h>
-#include <cds/intrusive/impl/skip_list.h>
-
-#endif

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 5f2d1285b02391e3bd2f5b1d1ff192b62bcb441e..736b7bd2d54da242c1a7674a32b69ebe48da11dd 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -697,9 +697,9 @@
     <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
     <ClInclude Include="..\..\..\cds\container\skip_list_set_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\container\skip_list_set_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_set_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\split_list_map_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\split_list_set_rcu.h" />\r
@@ -771,9 +771,9 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\mspriority_queue.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\options.h" />\r
+    <ClInclude Include="..\..\..\cds\intrusive\skip_list_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_hp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\intrusive\skip_list_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\split_list_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\striped_set.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index e5ae6fa2874419161d08570d53dcbb202ae1e22c..2503c601933f2a1d0511c9c9a7a098a680151bc7 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -872,15 +872,9 @@
     <ClInclude Include="..\..\..\cds\intrusive\skip_list_hp.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\intrusive\skip_list_ptb.h">\r
-      <Filter>Header Files\cds\intrusive</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\skip_list_set_hp.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\skip_list_set_ptb.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h">\r
       <Filter>Header Files\cds\container\details</Filter>\r
     </ClInclude>\r
@@ -1232,5 +1226,11 @@
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_dhp.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\intrusive\skip_list_dhp.h">\r
+      <Filter>Header Files\cds\intrusive</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\skip_list_set_dhp.h">\r
+      <Filter>Header Files\cds\container</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/projects/Win/vc12/hdr-test-map.vcxproj b/projects/Win/vc12/hdr-test-map.vcxproj
index e4846fcba510138f32ca12701f5581ecb1a66601..a7b44c84759581c84f41898dc4e8e28518b8cc12 100644 (file)
--- a/projects/Win/vc12/hdr-test-map.vcxproj
+++ b/projects/Win/vc12/hdr-test-map.vcxproj
@@ -570,7 +570,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_refinable_hashmap_map.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_refinable_hashmap_slist.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_hp.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_hrc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_nogc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_ptb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_rcu_gpb.cpp" />\r
@@ -580,7 +579,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_hp.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_hrc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_nogc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_ptb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_rcu_gpb.cpp" />\r

diff --git a/projects/Win/vc12/hdr-test-map.vcxproj.filters b/projects/Win/vc12/hdr-test-map.vcxproj.filters
index bd549070e6de88b78b396640bafb687a0bfe80dc..43021b3d3d78ee9d3a1c0b534bd8c508ab5d8ade 100644 (file)
--- a/projects/Win/vc12/hdr-test-map.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-map.vcxproj.filters
@@ -52,9 +52,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_hp.cpp">\r
       <Filter>skip_list</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_hrc.cpp">\r
-      <Filter>skip_list</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_skiplist_map_ptb.cpp">\r
       <Filter>skip_list</Filter>\r
     </ClCompile>\r
@@ -64,9 +61,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_hp.cpp">\r
       <Filter>split_list</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_hrc.cpp">\r
-      <Filter>split_list</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\map\hdr_splitlist_map_lazy_nogc.cpp">\r
       <Filter>split_list</Filter>\r
     </ClCompile>\r

diff --git a/tests/test-hdr/map/hdr_map.h b/tests/test-hdr/map/hdr_map.h
index 10b196aac5f41e9eb433fa8f0818ddee2c0bbe5c..a0ac48d4f4857ce4dd891e912c7e8ef6b5ab146b 100644 (file)
--- a/tests/test-hdr/map/hdr_map.h
+++ b/tests/test-hdr/map/hdr_map.h
@@ -668,10 +668,6 @@ namespace map {
         void Lazy_PTB_less();
         void Lazy_PTB_cmpmix();
 
-        void Lazy_HRC_cmp();
-        void Lazy_HRC_less();
-        void Lazy_HRC_cmpmix();
-
         void Lazy_RCU_GPI_cmp();
         void Lazy_RCU_GPI_less();
         void Lazy_RCU_GPI_cmpmix();
@@ -736,10 +732,6 @@ namespace map {
         void Split_Lazy_PTB_less();
         void Split_Lazy_PTB_cmpmix();
 
-        void Split_Lazy_HRC_cmp();
-        void Split_Lazy_HRC_less();
-        void Split_Lazy_HRC_cmpmix();
-
         void Split_Lazy_RCU_GPI_cmp();
         void Split_Lazy_RCU_GPI_less();
         void Split_Lazy_RCU_GPI_cmpmix();
@@ -805,10 +797,6 @@ namespace map {
             CPPUNIT_TEST(Lazy_PTB_less)
             CPPUNIT_TEST(Lazy_PTB_cmpmix)
 
-            CPPUNIT_TEST(Lazy_HRC_cmp)
-            CPPUNIT_TEST(Lazy_HRC_less)
-            CPPUNIT_TEST(Lazy_HRC_cmpmix)
-
             CPPUNIT_TEST(Lazy_RCU_GPI_cmp)
             CPPUNIT_TEST(Lazy_RCU_GPI_less)
             CPPUNIT_TEST(Lazy_RCU_GPI_cmpmix)
@@ -873,10 +861,6 @@ namespace map {
             CPPUNIT_TEST(Split_Lazy_PTB_less)
             CPPUNIT_TEST(Split_Lazy_PTB_cmpmix)
 
-            CPPUNIT_TEST(Split_Lazy_HRC_cmp)
-            CPPUNIT_TEST(Split_Lazy_HRC_less)
-            CPPUNIT_TEST(Split_Lazy_HRC_cmpmix)
-
             CPPUNIT_TEST(Split_Lazy_RCU_GPI_cmp)
             CPPUNIT_TEST(Split_Lazy_RCU_GPI_less)
             CPPUNIT_TEST(Split_Lazy_RCU_GPI_cmpmix)

diff --git a/tests/test-hdr/map/hdr_skiplist_map.h b/tests/test-hdr/map/hdr_skiplist_map.h
index 7c6f6a4db7e3983b9a5e41e872e14f620ace82cc..7b00054da2c0488ce2122d0334351bd549034905 100644 (file)
--- a/tests/test-hdr/map/hdr_skiplist_map.h
+++ b/tests/test-hdr/map/hdr_skiplist_map.h
@@ -394,31 +394,6 @@ namespace map {
         void SkipList_HP_michaelalloc_cmp_stat();
         void SkipList_HP_michaelalloc_cmpless_stat();
 
-        void SkipList_HRC_less();
-        void SkipList_HRC_cmp();
-        void SkipList_HRC_cmpless();
-        void SkipList_HRC_less_stat();
-        void SkipList_HRC_cmp_stat();
-        void SkipList_HRC_cmpless_stat();
-        void SkipList_HRC_xorshift_less();
-        void SkipList_HRC_xorshift_cmp();
-        void SkipList_HRC_xorshift_cmpless();
-        void SkipList_HRC_xorshift_less_stat();
-        void SkipList_HRC_xorshift_cmp_stat();
-        void SkipList_HRC_xorshift_cmpless_stat();
-        void SkipList_HRC_turbopas_less();
-        void SkipList_HRC_turbopas_cmp();
-        void SkipList_HRC_turbopas_cmpless();
-        void SkipList_HRC_turbopas_less_stat();
-        void SkipList_HRC_turbopas_cmp_stat();
-        void SkipList_HRC_turbopas_cmpless_stat();
-        void SkipList_HRC_michaelalloc_less();
-        void SkipList_HRC_michaelalloc_cmp();
-        void SkipList_HRC_michaelalloc_cmpless();
-        void SkipList_HRC_michaelalloc_less_stat();
-        void SkipList_HRC_michaelalloc_cmp_stat();
-        void SkipList_HRC_michaelalloc_cmpless_stat();
-
         void SkipList_PTB_less();
         void SkipList_PTB_cmp();
         void SkipList_PTB_cmpless();
@@ -495,31 +470,6 @@ namespace map {
             CPPUNIT_TEST(SkipList_HP_michaelalloc_cmp_stat)
             CPPUNIT_TEST(SkipList_HP_michaelalloc_cmpless_stat)
 
-            CPPUNIT_TEST(SkipList_HRC_less)
-            CPPUNIT_TEST(SkipList_HRC_cmp)
-            CPPUNIT_TEST(SkipList_HRC_cmpless)
-            CPPUNIT_TEST(SkipList_HRC_less_stat)
-            CPPUNIT_TEST(SkipList_HRC_cmp_stat)
-            CPPUNIT_TEST(SkipList_HRC_cmpless_stat)
-            CPPUNIT_TEST(SkipList_HRC_xorshift_less)
-            CPPUNIT_TEST(SkipList_HRC_xorshift_cmp)
-            CPPUNIT_TEST(SkipList_HRC_xorshift_cmpless)
-            CPPUNIT_TEST(SkipList_HRC_xorshift_less_stat)
-            CPPUNIT_TEST(SkipList_HRC_xorshift_cmp_stat)
-            CPPUNIT_TEST(SkipList_HRC_xorshift_cmpless_stat)
-            CPPUNIT_TEST(SkipList_HRC_turbopas_less)
-            CPPUNIT_TEST(SkipList_HRC_turbopas_cmp)
-            CPPUNIT_TEST(SkipList_HRC_turbopas_cmpless)
-            CPPUNIT_TEST(SkipList_HRC_turbopas_less_stat)
-            CPPUNIT_TEST(SkipList_HRC_turbopas_cmp_stat)
-            CPPUNIT_TEST(SkipList_HRC_turbopas_cmpless_stat)
-            CPPUNIT_TEST(SkipList_HRC_michaelalloc_less)
-            CPPUNIT_TEST(SkipList_HRC_michaelalloc_cmp)
-            CPPUNIT_TEST(SkipList_HRC_michaelalloc_cmpless)
-            CPPUNIT_TEST(SkipList_HRC_michaelalloc_less_stat)
-            CPPUNIT_TEST(SkipList_HRC_michaelalloc_cmp_stat)
-            CPPUNIT_TEST(SkipList_HRC_michaelalloc_cmpless_stat)
-
             CPPUNIT_TEST(SkipList_PTB_less)
             CPPUNIT_TEST(SkipList_PTB_cmp)
             CPPUNIT_TEST(SkipList_PTB_cmpless)

diff --git a/tests/test-hdr/map/hdr_skiplist_map_hrc.cpp b/tests/test-hdr/map/hdr_skiplist_map_hrc.cpp
deleted file mode 100644 (file)
index 9ad246c..0000000
--- a/tests/test-hdr/map/hdr_skiplist_map_hrc.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-//$$CDS-header$$
-
-#include "map/hdr_skiplist_map.h"
-#include <cds/container/skip_list_map_hrc.h>
-#include "unit/michael_alloc.h"
-#include "map/print_skiplist_stat.h"
-
-namespace map {
-
-    void SkipListMapHdrTest::SkipList_HRC_less()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_cmp()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_cmpless()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_less_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_cmp_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_cmpless_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_xorshift_less()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-                ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_xorshift_cmp()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_xorshift_cmpless()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_xorshift_less_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_xorshift_cmp_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_xorshift_cmpless_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_turbopas_less()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-                ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_turbopas_cmp()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_turbopas_cmpless()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_turbopas_less_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_turbopas_cmp_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_turbopas_cmpless_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_michaelalloc_less()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-                ,co::allocator< memory::MichaelAllocator<int> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_michaelalloc_cmp()
-    {
-            typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-                cc::skip_list::make_traits<
-                    co::compare< cmp >
-                    ,co::item_counter< simple_item_counter >
-                    ,co::allocator< memory::MichaelAllocator<int> >
-                >::type
-            > set;
-            test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_michaelalloc_cmpless()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::allocator< memory::MichaelAllocator<int> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_michaelalloc_less_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,co::allocator< memory::MichaelAllocator<int> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_michaelalloc_cmp_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,co::allocator< memory::MichaelAllocator<int> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-
-    void SkipListMapHdrTest::SkipList_HRC_michaelalloc_cmpless_stat()
-    {
-        typedef cc::SkipListMap< cds::gc::HRC, key_type, value_type,
-            cc::skip_list::make_traits<
-                co::less< less >
-                ,co::compare< cmp >
-                ,co::item_counter< simple_item_counter >
-                ,co::stat< cc::skip_list::stat<> >
-                ,co::allocator< memory::MichaelAllocator<int> >
-            >::type
-        > set;
-        test< set, misc::print_skiplist_stat<set::stat> >();
-    }
-} // namespace map

diff --git a/tests/test-hdr/map/hdr_skiplist_map_ptb.cpp b/tests/test-hdr/map/hdr_skiplist_map_ptb.cpp
index 994e4fbdf592b5171e51c67fce510f53d7ff15c0..7405d776f3055b0f11729554b54432c858394de3 100644 (file)
--- a/tests/test-hdr/map/hdr_skiplist_map_ptb.cpp
+++ b/tests/test-hdr/map/hdr_skiplist_map_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "map/hdr_skiplist_map.h"
-#include <cds/container/skip_list_map_ptb.h>
+#include <cds/container/skip_list_map_dhp.h>
 #include "unit/michael_alloc.h"
 #include "map/print_skiplist_stat.h"
 

diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_hrc.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_hrc.cpp
deleted file mode 100644 (file)
index 7da2ec4..0000000
--- a/tests/test-hdr/map/hdr_splitlist_map_lazy_hrc.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//$$CDS-header$$
-
-#include "map/hdr_map.h"
-#include <cds/container/lazy_list_hrc.h>
-#include <cds/container/split_list_map.h>
-
-namespace map {
-
-    namespace {
-        struct HRC_cmp_traits: public cc::split_list::type_traits
-        {
-            typedef cc::lazy_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::lazy_list::type_traits
-            {
-                typedef HashMapHdrTest::cmp   compare;
-            };
-        };
-
-        struct HRC_less_traits: public cc::split_list::type_traits
-        {
-            typedef cc::lazy_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::lazy_list::type_traits
-            {
-                typedef HashMapHdrTest::less   less;
-            };
-        };
-
-        struct HRC_cmpmix_traits: public cc::split_list::type_traits
-        {
-            typedef cc::lazy_list_tag                   ordered_list;
-            typedef HashMapHdrTest::hash_int            hash;
-            typedef HashMapHdrTest::simple_item_counter item_counter;
-
-            struct ordered_list_traits: public cc::lazy_list::type_traits
-            {
-                typedef HashMapHdrTest::cmp   compare;
-                typedef std::less<HashMapHdrTest::key_type>     less;
-            };
-        };
-    }
-
-    void HashMapHdrTest::Split_Lazy_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::lazy_list_tag>
-                ,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::lazy_list::make_traits<
-                        cc::opt::compare< cmp >
-                    >::type
-                >
-            >::type
-        > opt_map;
-        test_int< opt_map >();
-    }
-
-    void HashMapHdrTest::Split_Lazy_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::lazy_list_tag>
-                ,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::lazy_list::make_traits<
-                        cc::opt::less< less >
-                    >::type
-                >
-            >::type
-        > opt_map;
-        test_int< opt_map >();
-    }
-
-    void HashMapHdrTest::Split_Lazy_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::lazy_list_tag>
-                ,cc::opt::hash< hash_int >
-                ,cc::opt::item_counter< simple_item_counter >
-                ,cc::split_list::ordered_list_traits<
-                    cc::lazy_list::make_traits<
-                    cc::opt::less< std::less<key_type> >
-                        ,cc::opt::compare< cmp >
-                    >::type
-                >
-            >::type
-        > opt_map;
-        test_int< opt_map >();
-    }
-
-
-} // namespace map
-

diff --git a/tests/test-hdr/set/hdr_intrusive_skiplist_ptb.cpp b/tests/test-hdr/set/hdr_intrusive_skiplist_ptb.cpp
index 3b87ace4b5ab7db01901091ae749df075258e329..2ea52b9799dbed72a84552258cd2c1659699a772 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_skiplist_ptb.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_skiplist_ptb.cpp
@@ -2,7 +2,7 @@
 
 #include "set/hdr_intrusive_skiplist_set.h"
 
-#include <cds/intrusive/skip_list_ptb.h>
+#include <cds/intrusive/skip_list_dhp.h>
 #include "map/print_skiplist_stat.h"
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_intrusive_skiplist_ptb_member.cpp b/tests/test-hdr/set/hdr_intrusive_skiplist_ptb_member.cpp
index c81269648094f39e7ccb6214e0d8aab1839ffcce..f628dfbadfa12b244f57dc5b342f0c306cf9714b 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_skiplist_ptb_member.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_skiplist_ptb_member.cpp
@@ -2,7 +2,7 @@
 
 #include "set/hdr_intrusive_skiplist_set.h"
 
-#include <cds/intrusive/skip_list_ptb.h>
+#include <cds/intrusive/skip_list_dhp.h>
 #include "map/print_skiplist_stat.h"
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_skiplist_set_ptb.cpp b/tests/test-hdr/set/hdr_skiplist_set_ptb.cpp
index 22fea8676b67a970643cf8ed0c979e543237aa0e..60366f8f980f30cc7910baa9017c455c0499a4a2 100644 (file)
--- a/tests/test-hdr/set/hdr_skiplist_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_skiplist_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_skiplist_set.h"
-#include <cds/container/skip_list_set_ptb.h>
+#include <cds/container/skip_list_set_dhp.h>
 #include "unit/michael_alloc.h"
 #include "map/print_skiplist_stat.h"
 

diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index 0974bc0af137cb6ef08c467d00b5ef9ab5085ce6..6dbf1d98c6b8f8dd017c5c364aef77027cbb16b2 100644 (file)
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -33,7 +33,7 @@
 #include <cds/container/cuckoo_map.h>
 
 #include <cds/container/skip_list_map_hp.h>
-#include <cds/container/skip_list_map_ptb.h>
+#include <cds/container/skip_list_map_dhp.h>
 #include <cds/container/skip_list_map_rcu.h>
 #include <cds/container/skip_list_map_nogc.h>
 

diff --git a/tests/unit/pqueue/skiplist_pqueue.h b/tests/unit/pqueue/skiplist_pqueue.h
index 99bd9c216125944a08f2244127d9bed11e14f0bf..68a816e9c300c7d2a61d628a4d89fd4439f95efe 100644 (file)
--- a/tests/unit/pqueue/skiplist_pqueue.h
+++ b/tests/unit/pqueue/skiplist_pqueue.h
@@ -4,8 +4,7 @@
 #define __CDSUNIT_SKIPLIST_PQUEUE_H
 
 #include <cds/container/skip_list_set_hp.h>
-#include <cds/container/skip_list_set_hrc.h>
-#include <cds/container/skip_list_set_ptb.h>
+#include <cds/container/skip_list_set_dhp.h>
 #include <cds/urcu/general_instant.h>
 #include <cds/urcu/general_buffered.h>
 #include <cds/urcu/general_threaded.h>

diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h
index 6f27685f3dc2d69ad7712b96a4216abe6431e65d..36800dd5950371933308baef5744bdf8ed85ddfb 100644 (file)
--- a/tests/unit/set2/set_types.h
+++ b/tests/unit/set2/set_types.h
@@ -25,7 +25,7 @@
 #include <cds/container/cuckoo_set.h>
 
 #include <cds/container/skip_list_set_hp.h>
-#include <cds/container/skip_list_set_ptb.h>
+#include <cds/container/skip_list_set_dhp.h>
 #include <cds/container/skip_list_set_rcu.h>
 
 #include <cds/container/ellen_bintree_set_rcu.h>