rename lazy_list_ptb.h to lazy_list_dhp.h

diff --git a/cds/container/impl/lazy_kvlist.h b/cds/container/impl/lazy_kvlist.h
index 4eece5c96399914da86a0758cf6879d50c9f0c1c..d736e62057498e1612e8361996f7f9fed1a2f609 100644 (file)
--- a/cds/container/impl/lazy_kvlist.h
+++ b/cds/container/impl/lazy_kvlist.h
@@ -76,7 +76,7 @@ namespace cds { namespace container {
         There are different specializations of this template for each garbage collecting schema used.
         You should include appropriate .h-file depending on GC you are using:
         - for gc::HP: \code #include <cds/container/lazy_kvlist_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/container/lazy_kvlist_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/container/lazy_kvlist_dhp.h> \endcode
         - for \ref cds_urcu_desc "RCU": \code #include <cds/container/lazy_kvlist_rcu.h> \endcode
         - for gc::nogc: \code #include <cds/container/lazy_kvlist_nogc.h> \endcode
     */

diff --git a/cds/container/impl/lazy_list.h b/cds/container/impl/lazy_list.h
index fd8a56c9ccff248b12ee184549a99dbf771ea7ca..427dcaf2124c930f6567d450ca3cda1ab1eb6d14 100644 (file)
--- a/cds/container/impl/lazy_list.h
+++ b/cds/container/impl/lazy_list.h
@@ -92,7 +92,7 @@ namespace cds { namespace container {
         There are different specializations of this template for each garbage collecting schema used.
         You should include appropriate .h-file depending on GC you are using:
         - for gc::HP: \code #include <cds/container/lazy_list_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/container/lazy_list_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/container/lazy_list_dhp.h> \endcode
         - for \ref cds_urcu_desc "RCU": \code #include <cds/container/lazy_list_rcu.h> \endcode
         - for gc::nogc: \code #include <cds/container/lazy_list_nogc.h> \endcode
     */

diff --git a/cds/container/lazy_kvlist_dhp.h b/cds/container/lazy_kvlist_dhp.h
new file mode 100644 (file)
index 0000000..fa5708f
--- /dev/null
+++ b/cds/container/lazy_kvlist_dhp.h
@@ -0,0 +1,11 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_LAZY_KVLIST_DHP_H
+#define __CDS_CONTAINER_LAZY_KVLIST_DHP_H
+
+#include <cds/container/details/lazy_list_base.h>
+#include <cds/intrusive/lazy_list_dhp.h>
+#include <cds/container/details/make_lazy_kvlist.h>
+#include <cds/container/impl/lazy_kvlist.h>
+
+#endif  // #ifndef __CDS_CONTAINER_LAZY_KVLIST_DHP_H

diff --git a/cds/container/lazy_kvlist_ptb.h b/cds/container/lazy_kvlist_ptb.h
deleted file mode 100644 (file)
index 8b448f3..0000000
--- a/cds/container/lazy_kvlist_ptb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_LAZY_KVLIST_PTB_H
-#define __CDS_CONTAINER_LAZY_KVLIST_PTB_H
-
-#include <cds/container/details/lazy_list_base.h>
-#include <cds/intrusive/lazy_list_ptb.h>
-#include <cds/container/details/make_lazy_kvlist.h>
-#include <cds/container/impl/lazy_kvlist.h>
-
-#endif  // #ifndef __CDS_CONTAINER_LAZY_KVLIST_PTB_H

diff --git a/cds/container/lazy_list_dhp.h b/cds/container/lazy_list_dhp.h
new file mode 100644 (file)
index 0000000..68343e3
--- /dev/null
+++ b/cds/container/lazy_list_dhp.h
@@ -0,0 +1,11 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_LAZY_LIST_DHP_H
+#define __CDS_CONTAINER_LAZY_LIST_DHP_H
+
+#include <cds/container/details/lazy_list_base.h>
+#include <cds/intrusive/lazy_list_dhp.h>
+#include <cds/container/details/make_lazy_list.h>
+#include <cds/container/impl/lazy_list.h>
+
+#endif // #ifndef __CDS_CONTAINER_LAZY_LIST_DHP_H

diff --git a/cds/container/lazy_list_ptb.h b/cds/container/lazy_list_ptb.h
deleted file mode 100644 (file)
index 8bc2750..0000000
--- a/cds/container/lazy_list_ptb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_LAZY_LIST_PTB_H
-#define __CDS_CONTAINER_LAZY_LIST_PTB_H
-
-#include <cds/container/details/lazy_list_base.h>
-#include <cds/intrusive/lazy_list_ptb.h>
-#include <cds/container/details/make_lazy_list.h>
-#include <cds/container/impl/lazy_list.h>
-
-#endif // #ifndef __CDS_CONTAINER_LAZY_LIST_PTB_H

diff --git a/cds/container/split_list_set.h b/cds/container/split_list_set.h
index 1cf94eec814bddcb05e3a6ae0ea27a6c7a52fbd3..b353cdd701e1f1045fdd46a6157440d906c2b66c 100644 (file)
--- a/cds/container/split_list_set.h
+++ b/cds/container/split_list_set.h
@@ -33,10 +33,10 @@ namespace cds { namespace container {
         \par Usage
 
         You should decide what garbage collector you want, and what ordered list you want to use. Split-ordered list
-        is original data structure based on an ordered list. Suppose, you want construct split-list set based on gc::PTB GC
+        is original data structure based on an ordered list. Suppose, you want construct split-list set based on gc::DHP GC
         and LazyList as ordered list implementation. So, you beginning your program with following include:
         \code
-        #include <cds/container/lazy_list_ptb.h>
+        #include <cds/container/lazy_list_dhp.h>
         #include <cds/container/split_list_set.h>
 
         namespace cc = cds::container;
@@ -47,7 +47,7 @@ namespace cds { namespace container {
             std::string strValue    ;   // value field
         };
         \endcode
-        The inclusion order is important: first, include header for ordered-list implementation (for this example, <tt>cds/container/lazy_list_ptb.h</tt>),
+        The inclusion order is important: first, include header for ordered-list implementation (for this example, <tt>cds/container/lazy_list_dhp.h</tt>),
         then the header for split-list set <tt>cds/container/split_list_set.h</tt>.
 
         Now, you should declare traits for split-list set. The main parts of traits are a hash functor for the set and a comparing functor for ordered list.

diff --git a/cds/intrusive/impl/lazy_list.h b/cds/intrusive/impl/lazy_list.h
index 1e60ecbfdcec1ba89a198ab7173edcdda9c4775a..13df80496b050efce2dc9dd453b95f55b345506e 100644 (file)
--- a/cds/intrusive/impl/lazy_list.h
+++ b/cds/intrusive/impl/lazy_list.h
@@ -89,7 +89,7 @@ namespace cds { namespace intrusive {
         There are different specializations of this template for each garbage collecting schema used.
         You should select GC needed and include appropriate .h-file:
         - for gc::HP: \code #include <cds/intrusive/lazy_list_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/intrusive/lazy_list_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/intrusive/lazy_list_dhp.h> \endcode
         - for gc::nogc: \code #include <cds/intrusive/lazy_list_nogc.h> \endcode
         - for \ref cds_urcu_type "RCU" - see \ref cds_intrusive_LazyList_rcu "LazyList RCU specialization"
 
@@ -100,7 +100,7 @@ namespace cds { namespace intrusive {
         Example for gc::PTB and base hook:
         \code
         // Include GC-related lazy list specialization
-        #include <cds/intrusive/lazy_list_ptb.h>
+        #include <cds/intrusive/lazy_list_dhp.h>
 
         // Data stored in lazy list
         struct my_data: public cds::intrusive::lazy_list::node< cds::gc::PTB >
@@ -145,7 +145,7 @@ namespace cds { namespace intrusive {
         Equivalent option-based code:
         \code
         // GC-related specialization
-        #include <cds/intrusive/lazy_list_ptb.h>
+        #include <cds/intrusive/lazy_list_dhp.h>
 
         struct my_data {
             // see above

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

diff --git a/cds/intrusive/lazy_list_ptb.h b/cds/intrusive/lazy_list_ptb.h
deleted file mode 100644 (file)
index 3892e0f..0000000
--- a/cds/intrusive/lazy_list_ptb.h
+++ /dev/null
@@ -1,9 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_INTRUSIVE_LAZY_LIST_PTB_H
-#define __CDS_INTRUSIVE_LAZY_LIST_PTB_H
-
-#include <cds/intrusive/impl/lazy_list.h>
-#include <cds/gc/ptb.h>
-
-#endif // #ifndef __CDS_INTRUSIVE_LAZY_LIST_PTB_H

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 48b3c62a64658cd7fad9e463e06996ff9701044d..5f2d1285b02391e3bd2f5b1d1ff192b62bcb441e 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -682,7 +682,9 @@
     <ClInclude Include="..\..\..\cds\container\impl\michael_list.h" />\r
     <ClInclude Include="..\..\..\cds\container\impl\skip_list_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\impl\skip_list_set.h" />\r
+    <ClInclude Include="..\..\..\cds\container\lazy_kvlist_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_rcu.h" />\r
+    <ClInclude Include="..\..\..\cds\container\lazy_list_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_list_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_rcu.h" />\r
@@ -762,6 +764,7 @@
     <ClInclude Include="..\..\..\cds\intrusive\impl\lazy_list.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\impl\michael_list.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\impl\skip_list.h" />\r
+    <ClInclude Include="..\..\..\cds\intrusive\lazy_list_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_rcu.h" />\r
@@ -930,7 +933,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\fcstack.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_hp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\intrusive\lazy_list_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_set.h" />\r
@@ -950,10 +952,8 @@
     <ClInclude Include="..\..\..\cds\container\fcstack.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\container\lazy_kvlist_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_list_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_list_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\container\lazy_list_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index bef684be269996a2f8d101aaa93ccd1cff54db56..e5ae6fa2874419161d08570d53dcbb202ae1e22c 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -545,9 +545,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\lazy_list_nogc.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\intrusive\lazy_list_ptb.h">\r
-      <Filter>Header Files\cds\intrusive</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hp.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
@@ -605,18 +602,12 @@
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_nogc.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\lazy_kvlist_ptb.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\lazy_list_hp.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\lazy_list_nogc.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\lazy_list_ptb.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_hp.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
@@ -1232,5 +1223,14 @@
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_dhp.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\intrusive\lazy_list_dhp.h">\r
+      <Filter>Header Files\cds\intrusive</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\lazy_list_dhp.h">\r
+      <Filter>Header Files\cds\container</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\lazy_kvlist_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-ordered-list.vcxproj b/projects/Win/vc12/hdr-test-ordered-list.vcxproj
index 68ac25451670ecbc93bdf279030e7f6488e1386f..12eb01673f6fbe8e3919ce584523b9a25993008c 100644 (file)
--- a/projects/Win/vc12/hdr-test-ordered-list.vcxproj
+++ b/projects/Win/vc12/hdr-test-ordered-list.vcxproj
@@ -543,9 +543,9 @@
     <ClInclude Include="..\..\..\tests\test-hdr\ordered_list\hdr_michael_kv.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_dhp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_nogc.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_ptb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_rcu_gpt.cpp" />\r
@@ -559,17 +559,17 @@
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_list_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_nogc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_michael_ptb.cpp" />\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_dhp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_hp.cpp" />\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_dhp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_nogc.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_ptb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_gpt.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_shb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_nogc.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_ptb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_rcu_gpt.cpp" />\r

diff --git a/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters b/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
index 07fd2c663a844b9a4679584b9752487c3c13a494..55b8bdfe15534a5c4e0994f48f2fc7c2e820d4f9 100644 (file)
--- a/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
@@ -7,9 +7,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_nogc.cpp">\r
       <Filter>intrusive</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_ptb.cpp">\r
-      <Filter>intrusive</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_rcu_gpb.cpp">\r
       <Filter>intrusive</Filter>\r
     </ClCompile>\r
@@ -46,15 +43,9 @@
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_nogc.cpp">\r
       <Filter>container</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_ptb.cpp">\r
-      <Filter>container</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_nogc.cpp">\r
       <Filter>container</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_ptb.cpp">\r
-      <Filter>container</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_rcu_gpb.cpp">\r
       <Filter>container</Filter>\r
     </ClCompile>\r
@@ -145,6 +136,15 @@
     <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_michael_rcu_sht.cpp">\r
       <Filter>container</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy_dhp.cpp">\r
+      <Filter>intrusive</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_dhp.cpp">\r
+      <Filter>container</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\ordered_list\hdr_lazy_kv_dhp.cpp">\r
+      <Filter>container</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\tests\test-hdr\ordered_list\hdr_intrusive_lazy.h">\r

diff --git a/tests/test-hdr/map/hdr_michael_map_lazy_ptb.cpp b/tests/test-hdr/map/hdr_michael_map_lazy_ptb.cpp
index f083e0a68aee2dfb2b0f0365839468319262b165..ed55333106012a9bc59e5f94faf89ebd7bd6a286 100644 (file)
--- a/tests/test-hdr/map/hdr_michael_map_lazy_ptb.cpp
+++ b/tests/test-hdr/map/hdr_michael_map_lazy_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "map/hdr_map.h"
-#include <cds/container/lazy_kvlist_ptb.h>
+#include <cds/container/lazy_kvlist_dhp.h>
 #include <cds/container/michael_map.h>
 
 namespace map {

diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp
index 7ad4b2846db1d331573b8809d72b4c379cbde610..6e7ab77e6cd60db6a65dd7b2311b1ef490ee39cb 100644 (file)
--- a/tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp
+++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "map/hdr_map.h"
-#include <cds/container/lazy_list_ptb.h>
+#include <cds/container/lazy_list_dhp.h>
 #include <cds/container/split_list_map.h>
 
 namespace map {

diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h b/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h
index 4af44724ece26564a73634f3be16b3a116a3b09e..2c910c90e884fcca7c779ea0912e8deee7120534 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h
@@ -735,14 +735,14 @@ namespace ordlist {
         void HP_member_cmpmix();
         void HP_member_ic();
 
-        void PTB_base_cmp();
-        void PTB_base_less();
-        void PTB_base_cmpmix();
-        void PTB_base_ic();
-        void PTB_member_cmp();
-        void PTB_member_less();
-        void PTB_member_cmpmix();
-        void PTB_member_ic();
+        void DHP_base_cmp();
+        void DHP_base_less();
+        void DHP_base_cmpmix();
+        void DHP_base_ic();
+        void DHP_member_cmp();
+        void DHP_member_less();
+        void DHP_member_cmpmix();
+        void DHP_member_ic();
 
         void RCU_GPI_base_cmp();
         void RCU_GPI_base_less();
@@ -809,14 +809,14 @@ namespace ordlist {
             CPPUNIT_TEST(HP_member_cmpmix)
             CPPUNIT_TEST(HP_member_ic)
 
-            CPPUNIT_TEST(PTB_base_cmp)
-            CPPUNIT_TEST(PTB_base_less)
-            CPPUNIT_TEST(PTB_base_cmpmix)
-            CPPUNIT_TEST(PTB_base_ic)
-            CPPUNIT_TEST(PTB_member_cmp)
-            CPPUNIT_TEST(PTB_member_less)
-            CPPUNIT_TEST(PTB_member_cmpmix)
-            CPPUNIT_TEST(PTB_member_ic)
+            CPPUNIT_TEST(DHP_base_cmp)
+            CPPUNIT_TEST(DHP_base_less)
+            CPPUNIT_TEST(DHP_base_cmpmix)
+            CPPUNIT_TEST(DHP_base_ic)
+            CPPUNIT_TEST(DHP_member_cmp)
+            CPPUNIT_TEST(DHP_member_less)
+            CPPUNIT_TEST(DHP_member_cmpmix)
+            CPPUNIT_TEST(DHP_member_ic)
 
             CPPUNIT_TEST(RCU_GPI_base_cmp)
             CPPUNIT_TEST(RCU_GPI_base_less)

diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_lazy_dhp.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_lazy_dhp.cpp
new file mode 100644 (file)
index 0000000..6d8a7a5
--- /dev/null
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_lazy_dhp.cpp
@@ -0,0 +1,129 @@
+//$$CDS-header$$
+
+#include "ordered_list/hdr_intrusive_lazy.h"
+#include <cds/intrusive/lazy_list_dhp.h>
+
+namespace ordlist {
+    void IntrusiveLazyListHeaderTest::DHP_base_cmp()
+    {
+        typedef base_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+    void IntrusiveLazyListHeaderTest::DHP_base_less()
+    {
+        typedef base_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+    void IntrusiveLazyListHeaderTest::DHP_base_cmpmix()
+    {
+        typedef base_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+    void IntrusiveLazyListHeaderTest::DHP_base_ic()
+    {
+        typedef base_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+                ,co::item_counter< cds::atomicity::item_counter >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+    void IntrusiveLazyListHeaderTest::DHP_member_cmp()
+    {
+        typedef member_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+    void IntrusiveLazyListHeaderTest::DHP_member_less()
+    {
+        typedef member_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+    void IntrusiveLazyListHeaderTest::DHP_member_cmpmix()
+    {
+        typedef member_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::less< less<item> >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+    void IntrusiveLazyListHeaderTest::DHP_member_ic()
+    {
+        typedef member_int_item< cds::gc::DHP > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+                ,co::item_counter< cds::atomicity::item_counter >
+            >::type
+        >    list;
+        test_int<list>();
+    }
+
+} // namespace ordlist

diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_lazy_ptb.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_lazy_ptb.cpp
deleted file mode 100644 (file)
index 057db78..0000000
--- a/tests/test-hdr/ordered_list/hdr_intrusive_lazy_ptb.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//$$CDS-header$$
-
-#include "ordered_list/hdr_intrusive_lazy.h"
-#include <cds/intrusive/lazy_list_ptb.h>
-
-namespace ordlist {
-    void IntrusiveLazyListHeaderTest::PTB_base_cmp()
-    {
-        typedef base_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-    void IntrusiveLazyListHeaderTest::PTB_base_less()
-    {
-        typedef base_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-    void IntrusiveLazyListHeaderTest::PTB_base_cmpmix()
-    {
-        typedef base_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-    void IntrusiveLazyListHeaderTest::PTB_base_ic()
-    {
-        typedef base_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-                ,co::item_counter< cds::atomicity::item_counter >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-    void IntrusiveLazyListHeaderTest::PTB_member_cmp()
-    {
-        typedef member_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-    void IntrusiveLazyListHeaderTest::PTB_member_less()
-    {
-        typedef member_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-    void IntrusiveLazyListHeaderTest::PTB_member_cmpmix()
-    {
-        typedef member_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::less< less<item> >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-    void IntrusiveLazyListHeaderTest::PTB_member_ic()
-    {
-        typedef member_int_item< cds::gc::PTB > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-                ,co::item_counter< cds::atomicity::item_counter >
-            >::type
-        >    list;
-        test_int<list>();
-    }
-
-} // namespace ordlist

diff --git a/tests/test-hdr/ordered_list/hdr_lazy.h b/tests/test-hdr/ordered_list/hdr_lazy.h
index d90476d5b6fc8b3a0278a2484d8359e58138ce7c..bbaac65812f770f409fdab7adfb26839da28b1f3 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_lazy.h
+++ b/tests/test-hdr/ordered_list/hdr_lazy.h
@@ -678,10 +678,10 @@ namespace ordlist {
         void HP_cmpmix();
         void HP_ic();
 
-        void PTB_cmp();
-        void PTB_less();
-        void PTB_cmpmix();
-        void PTB_ic();
+        void DHP_cmp();
+        void DHP_less();
+        void DHP_cmpmix();
+        void DHP_ic();
 
         void RCU_GPI_cmp();
         void RCU_GPI_less();
@@ -719,10 +719,10 @@ namespace ordlist {
             CPPUNIT_TEST(HP_cmpmix)
             CPPUNIT_TEST(HP_ic)
 
-            CPPUNIT_TEST(PTB_cmp)
-            CPPUNIT_TEST(PTB_less)
-            CPPUNIT_TEST(PTB_cmpmix)
-            CPPUNIT_TEST(PTB_ic)
+            CPPUNIT_TEST(DHP_cmp)
+            CPPUNIT_TEST(DHP_less)
+            CPPUNIT_TEST(DHP_cmpmix)
+            CPPUNIT_TEST(DHP_ic)
 
             CPPUNIT_TEST(RCU_GPI_cmp)
             CPPUNIT_TEST(RCU_GPI_less)

diff --git a/tests/test-hdr/ordered_list/hdr_lazy_dhp.cpp b/tests/test-hdr/ordered_list/hdr_lazy_dhp.cpp
new file mode 100644 (file)
index 0000000..2e14d9f
--- /dev/null
+++ b/tests/test-hdr/ordered_list/hdr_lazy_dhp.cpp
@@ -0,0 +1,100 @@
+//$$CDS-header$$
+
+#include "ordered_list/hdr_lazy.h"
+#include <cds/container/lazy_list_dhp.h>
+
+namespace ordlist {
+    namespace {
+        struct DHP_cmp_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyListTestHeader::cmp<LazyListTestHeader::item>   compare;
+        };
+    }
+    void LazyListTestHeader::DHP_cmp()
+    {
+        // traits-based version
+        typedef cc::LazyList< cds::gc::DHP, item, DHP_cmp_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyList< cds::gc::DHP, item,
+            cc::lazy_list::make_traits<
+                cc::opt::compare< cmp<item> >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+    namespace {
+        struct DHP_less_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyListTestHeader::lt<LazyListTestHeader::item>   less;
+        };
+    }
+    void LazyListTestHeader::DHP_less()
+    {
+        // traits-based version
+        typedef cc::LazyList< cds::gc::DHP, item, DHP_less_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyList< cds::gc::DHP, item,
+            cc::lazy_list::make_traits<
+                cc::opt::less< lt<item> >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+    namespace {
+        struct DHP_cmpmix_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyListTestHeader::cmp<LazyListTestHeader::item>   compare;
+            typedef LazyListTestHeader::lt<LazyListTestHeader::item>  less;
+        };
+    }
+    void LazyListTestHeader::DHP_cmpmix()
+    {
+        // traits-based version
+        typedef cc::LazyList< cds::gc::DHP, item, DHP_cmpmix_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyList< cds::gc::DHP, item,
+            cc::lazy_list::make_traits<
+                cc::opt::compare< cmp<item> >
+                ,cc::opt::less< lt<item> >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+    namespace {
+        struct DHP_ic_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyListTestHeader::lt<LazyListTestHeader::item>   less;
+            typedef cds::atomicity::item_counter item_counter;
+        };
+    }
+    void LazyListTestHeader::DHP_ic()
+    {
+        // traits-based version
+        typedef cc::LazyList< cds::gc::DHP, item, DHP_ic_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyList< cds::gc::DHP, item,
+            cc::lazy_list::make_traits<
+                cc::opt::less< lt<item> >
+                ,cc::opt::item_counter< cds::atomicity::item_counter >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+}   // namespace ordlist
+

diff --git a/tests/test-hdr/ordered_list/hdr_lazy_kv.h b/tests/test-hdr/ordered_list/hdr_lazy_kv.h
index 76cb04579b3657ec8ee192b4976acd89716fef32..ccbd71174f9350129db8398fa03a6b3d92a95a1e 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_lazy_kv.h
+++ b/tests/test-hdr/ordered_list/hdr_lazy_kv.h
@@ -590,10 +590,10 @@ namespace ordlist {
         void HP_cmpmix();
         void HP_ic();
 
-        void PTB_cmp();
-        void PTB_less();
-        void PTB_cmpmix();
-        void PTB_ic();
+        void DHP_cmp();
+        void DHP_less();
+        void DHP_cmpmix();
+        void DHP_ic();
 
         void RCU_GPI_cmp();
         void RCU_GPI_less();
@@ -631,10 +631,10 @@ namespace ordlist {
             CPPUNIT_TEST(HP_cmpmix)
             CPPUNIT_TEST(HP_ic)
 
-            CPPUNIT_TEST(PTB_cmp)
-            CPPUNIT_TEST(PTB_less)
-            CPPUNIT_TEST(PTB_cmpmix)
-            CPPUNIT_TEST(PTB_ic)
+            CPPUNIT_TEST(DHP_cmp)
+            CPPUNIT_TEST(DHP_less)
+            CPPUNIT_TEST(DHP_cmpmix)
+            CPPUNIT_TEST(DHP_ic)
 
             CPPUNIT_TEST(RCU_GPI_cmp)
             CPPUNIT_TEST(RCU_GPI_less)

diff --git a/tests/test-hdr/ordered_list/hdr_lazy_kv_dhp.cpp b/tests/test-hdr/ordered_list/hdr_lazy_kv_dhp.cpp
new file mode 100644 (file)
index 0000000..9ecd60e
--- /dev/null
+++ b/tests/test-hdr/ordered_list/hdr_lazy_kv_dhp.cpp
@@ -0,0 +1,100 @@
+//$$CDS-header$$
+
+#include "ordered_list/hdr_lazy_kv.h"
+#include <cds/container/lazy_kvlist_dhp.h>
+
+namespace ordlist {
+    namespace {
+        struct DHP_cmp_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyKVListTestHeader::cmp<LazyKVListTestHeader::key_type>   compare;
+        };
+    }
+    void LazyKVListTestHeader::DHP_cmp()
+    {
+        // traits-based version
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type, DHP_cmp_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type,
+            cc::lazy_list::make_traits<
+                cc::opt::compare< cmp<key_type> >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+    namespace {
+        struct DHP_less_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyKVListTestHeader::lt<LazyKVListTestHeader::key_type>   less;
+        };
+    }
+    void LazyKVListTestHeader::DHP_less()
+    {
+        // traits-based version
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type, DHP_less_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type,
+            cc::lazy_list::make_traits<
+                cc::opt::less< lt<key_type> >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+    namespace {
+        struct DHP_cmpmix_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyKVListTestHeader::cmp<LazyKVListTestHeader::key_type>   compare;
+            typedef LazyKVListTestHeader::lt<LazyKVListTestHeader::key_type>  less;
+        };
+    }
+    void LazyKVListTestHeader::DHP_cmpmix()
+    {
+        // traits-based version
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type, DHP_cmpmix_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type,
+            cc::lazy_list::make_traits<
+                cc::opt::compare< cmp<key_type> >
+                ,cc::opt::less< lt<key_type> >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+    namespace {
+        struct DHP_ic_traits: public cc::lazy_list::type_traits
+        {
+            typedef LazyKVListTestHeader::lt<LazyKVListTestHeader::key_type>   less;
+            typedef cds::atomicity::item_counter item_counter;
+        };
+    }
+    void LazyKVListTestHeader::DHP_ic()
+    {
+        // traits-based version
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type, DHP_ic_traits > list;
+        test< list >();
+
+        // option-based version
+
+        typedef cc::LazyKVList< cds::gc::DHP, key_type, value_type,
+            cc::lazy_list::make_traits<
+                cc::opt::less< lt<key_type> >
+                ,cc::opt::item_counter< cds::atomicity::item_counter >
+            >::type
+        > opt_list;
+        test< opt_list >();
+    }
+
+}   // namespace ordlist
+

diff --git a/tests/test-hdr/ordered_list/hdr_lazy_kv_ptb.cpp b/tests/test-hdr/ordered_list/hdr_lazy_kv_ptb.cpp
deleted file mode 100644 (file)
index 5c02e57..0000000
--- a/tests/test-hdr/ordered_list/hdr_lazy_kv_ptb.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//$$CDS-header$$
-
-#include "ordered_list/hdr_lazy_kv.h"
-#include <cds/container/lazy_kvlist_ptb.h>
-
-namespace ordlist {
-    namespace {
-        struct PTB_cmp_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyKVListTestHeader::cmp<LazyKVListTestHeader::key_type>   compare;
-        };
-    }
-    void LazyKVListTestHeader::PTB_cmp()
-    {
-        // traits-based version
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type, PTB_cmp_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type,
-            cc::lazy_list::make_traits<
-                cc::opt::compare< cmp<key_type> >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-    namespace {
-        struct PTB_less_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyKVListTestHeader::lt<LazyKVListTestHeader::key_type>   less;
-        };
-    }
-    void LazyKVListTestHeader::PTB_less()
-    {
-        // traits-based version
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type, PTB_less_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type,
-            cc::lazy_list::make_traits<
-                cc::opt::less< lt<key_type> >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-    namespace {
-        struct PTB_cmpmix_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyKVListTestHeader::cmp<LazyKVListTestHeader::key_type>   compare;
-            typedef LazyKVListTestHeader::lt<LazyKVListTestHeader::key_type>  less;
-        };
-    }
-    void LazyKVListTestHeader::PTB_cmpmix()
-    {
-        // traits-based version
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type, PTB_cmpmix_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type,
-            cc::lazy_list::make_traits<
-                cc::opt::compare< cmp<key_type> >
-                ,cc::opt::less< lt<key_type> >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-    namespace {
-        struct PTB_ic_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyKVListTestHeader::lt<LazyKVListTestHeader::key_type>   less;
-            typedef cds::atomicity::item_counter item_counter;
-        };
-    }
-    void LazyKVListTestHeader::PTB_ic()
-    {
-        // traits-based version
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type, PTB_ic_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyKVList< cds::gc::PTB, key_type, value_type,
-            cc::lazy_list::make_traits<
-                cc::opt::less< lt<key_type> >
-                ,cc::opt::item_counter< cds::atomicity::item_counter >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-}   // namespace ordlist
-

diff --git a/tests/test-hdr/ordered_list/hdr_lazy_ptb.cpp b/tests/test-hdr/ordered_list/hdr_lazy_ptb.cpp
deleted file mode 100644 (file)
index dbd0ba3..0000000
--- a/tests/test-hdr/ordered_list/hdr_lazy_ptb.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//$$CDS-header$$
-
-#include "ordered_list/hdr_lazy.h"
-#include <cds/container/lazy_list_ptb.h>
-
-namespace ordlist {
-    namespace {
-        struct PTB_cmp_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyListTestHeader::cmp<LazyListTestHeader::item>   compare;
-        };
-    }
-    void LazyListTestHeader::PTB_cmp()
-    {
-        // traits-based version
-        typedef cc::LazyList< cds::gc::PTB, item, PTB_cmp_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyList< cds::gc::PTB, item,
-            cc::lazy_list::make_traits<
-                cc::opt::compare< cmp<item> >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-    namespace {
-        struct PTB_less_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyListTestHeader::lt<LazyListTestHeader::item>   less;
-        };
-    }
-    void LazyListTestHeader::PTB_less()
-    {
-        // traits-based version
-        typedef cc::LazyList< cds::gc::PTB, item, PTB_less_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyList< cds::gc::PTB, item,
-            cc::lazy_list::make_traits<
-                cc::opt::less< lt<item> >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-    namespace {
-        struct PTB_cmpmix_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyListTestHeader::cmp<LazyListTestHeader::item>   compare;
-            typedef LazyListTestHeader::lt<LazyListTestHeader::item>  less;
-        };
-    }
-    void LazyListTestHeader::PTB_cmpmix()
-    {
-        // traits-based version
-        typedef cc::LazyList< cds::gc::PTB, item, PTB_cmpmix_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyList< cds::gc::PTB, item,
-            cc::lazy_list::make_traits<
-                cc::opt::compare< cmp<item> >
-                ,cc::opt::less< lt<item> >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-    namespace {
-        struct PTB_ic_traits: public cc::lazy_list::type_traits
-        {
-            typedef LazyListTestHeader::lt<LazyListTestHeader::item>   less;
-            typedef cds::atomicity::item_counter item_counter;
-        };
-    }
-    void LazyListTestHeader::PTB_ic()
-    {
-        // traits-based version
-        typedef cc::LazyList< cds::gc::PTB, item, PTB_ic_traits > list;
-        test< list >();
-
-        // option-based version
-
-        typedef cc::LazyList< cds::gc::PTB, item,
-            cc::lazy_list::make_traits<
-                cc::opt::less< lt<item> >
-                ,cc::opt::item_counter< cds::atomicity::item_counter >
-            >::type
-        > opt_list;
-        test< opt_list >();
-    }
-
-}   // namespace ordlist
-

diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp
index 716ce5951d0e48f83371d515796a38efc534e2d1..aebf530d1459fd5dd135deecd8bc54b21eb8fe9d 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/lazy_list_ptb.h>
+#include <cds/intrusive/lazy_list_dhp.h>
 #include <cds/intrusive/michael_set.h>
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp
index 5710a89c5ee8c6e595cdbf99650deea9e6511f2b..86879e7c231e7f62b7302009fc90233c438512fd 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/lazy_list_ptb.h>
+#include <cds/intrusive/lazy_list_dhp.h>
 #include <cds/intrusive/split_list.h>
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_michael_set_lazy_ptb.cpp b/tests/test-hdr/set/hdr_michael_set_lazy_ptb.cpp
index 4d818baa68e00783446bbae08b9e08cc3e66dbb2..b8c3136f22ea769a15723e95a84f24ffae84c009 100644 (file)
--- a/tests/test-hdr/set/hdr_michael_set_lazy_ptb.cpp
+++ b/tests/test-hdr/set/hdr_michael_set_lazy_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_set.h"
-#include <cds/container/lazy_list_ptb.h>
+#include <cds/container/lazy_list_dhp.h>
 #include <cds/container/michael_set.h>
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp b/tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp
index e7651457b7f3349715623f0e2347e2aa4ff6bf55..6195103d8b40c444b1f7c9e34ff04a25e4f35585 100644 (file)
--- a/tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp
+++ b/tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_set.h"
-#include <cds/container/lazy_list_ptb.h>
+#include <cds/container/lazy_list_dhp.h>
 #include <cds/container/split_list_set.h>
 
 namespace set {

diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index 21037d8a9fa8f2b07b2bfc27d95a672bbf69fc73..0974bc0af137cb6ef08c467d00b5ef9ab5085ce6 100644 (file)
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -15,7 +15,7 @@
 #include <cds/container/michael_kvlist_nogc.h>
 
 #include <cds/container/lazy_kvlist_hp.h>
-#include <cds/container/lazy_kvlist_ptb.h>
+#include <cds/container/lazy_kvlist_dhp.h>
 #include <cds/container/lazy_kvlist_rcu.h>
 #include <cds/container/lazy_kvlist_nogc.h>
 
@@ -1013,45 +1013,45 @@ namespace map2 {
             >::type
         >   LazyList_HP_less_michaelAlloc;
 
-        typedef cc::LazyKVList< cds::gc::PTB, Key, Value,
+        typedef cc::LazyKVList< cds::gc::DHP, Key, Value,
             typename cc::lazy_list::make_traits<
                 co::compare< compare >
             >::type
-        >   LazyList_PTB_cmp_stdAlloc;
+        >   LazyList_DHP_cmp_stdAlloc;
 
-        typedef cc::LazyKVList< cds::gc::PTB, Key, Value,
+        typedef cc::LazyKVList< cds::gc::DHP, Key, Value,
             typename cc::lazy_list::make_traits<
                 co::compare< compare >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   LazyList_PTB_cmp_stdAlloc_seqcst;
+        >   LazyList_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::LazyKVList< cds::gc::PTB, Key, Value,
+        typedef cc::LazyKVList< cds::gc::DHP, Key, Value,
             typename cc::lazy_list::make_traits<
                 co::compare< compare >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   LazyList_PTB_cmp_michaelAlloc;
+        >   LazyList_DHP_cmp_michaelAlloc;
 
-        typedef cc::LazyKVList< cds::gc::PTB, Key, Value,
+        typedef cc::LazyKVList< cds::gc::DHP, Key, Value,
             typename cc::lazy_list::make_traits<
                 co::less< less >
             >::type
-        >   LazyList_PTB_less_stdAlloc;
+        >   LazyList_DHP_less_stdAlloc;
 
-        typedef cc::LazyKVList< cds::gc::PTB, Key, Value,
+        typedef cc::LazyKVList< cds::gc::DHP, Key, Value,
             typename cc::lazy_list::make_traits<
                 co::less< less >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   LazyList_PTB_less_stdAlloc_seqcst;
+        >   LazyList_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::LazyKVList< cds::gc::PTB, Key, Value,
+        typedef cc::LazyKVList< cds::gc::DHP, Key, Value,
             typename cc::lazy_list::make_traits<
                 co::less< less >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   LazyList_PTB_less_michaelAlloc;
+        >   LazyList_DHP_less_michaelAlloc;
 
         // RCU
         typedef cc::LazyKVList< rcu_gpi, Key, Value,
@@ -1342,38 +1342,38 @@ namespace map2 {
             >::type
         >   MichaelMap_Lazy_HP_less_michaelAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_PTB_cmp_stdAlloc,
+        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelMap_Lazy_PTB_cmp_stdAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_PTB_cmp_stdAlloc_seqcst,
+        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc_seqcst,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelMap_Lazy_PTB_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_PTB_cmp_michaelAlloc,
+        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_cmp_michaelAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
         >   MichaelMap_Lazy_PTB_cmp_michaelAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_PTB_less_stdAlloc,
+        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_less_stdAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelMap_Lazy_PTB_less_stdAlloc;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_PTB_less_stdAlloc_seqcst,
+        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_less_stdAlloc_seqcst,
             typename cc::michael_map::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelMap_Lazy_PTB_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_PTB_less_michaelAlloc,
+        typedef cc::MichaelHashMap< cds::gc::PTB, LazyList_DHP_less_michaelAlloc,
             typename cc::michael_map::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >

diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h
index 3263e100c21d5bed1f4709c050a1e3f69e7e818e..6f27685f3dc2d69ad7712b96a4216abe6431e65d 100644 (file)
--- a/tests/unit/set2/set_types.h
+++ b/tests/unit/set2/set_types.h
@@ -13,7 +13,7 @@
 #include <cds/container/michael_list_dhp.h>
 #include <cds/container/michael_list_rcu.h>
 #include <cds/container/lazy_list_hp.h>
-#include <cds/container/lazy_list_ptb.h>
+#include <cds/container/lazy_list_dhp.h>
 #include <cds/container/lazy_list_rcu.h>
 
 #include <cds/container/michael_set.h>
@@ -45,10 +45,7 @@
 #   include <cds/container/striped_set/boost_vector.h>
 #   include <cds/container/striped_set/boost_stable_vector.h>
 #   include <cds/container/striped_set/boost_set.h>
-//#   if !(CDS_COMPILER == CDS_COMPILER_MSVC && CDS_COMPILER_VERSION >= 1700)
-//#       define CDS_UNIT_MAP_TYPES_ENABLE_BOOST_FLAT_CONTAINERS
-#       include <cds/container/striped_set/boost_flat_set.h>
-//#   endif
+#   include <cds/container/striped_set/boost_flat_set.h>
 #endif
 #include <cds/container/striped_set.h>
 
@@ -918,45 +915,45 @@ namespace set2 {
             >::type
         >   LazyList_HP_less_michaelAlloc;
 
-        typedef cc::LazyList< cds::gc::PTB, key_val,
+        typedef cc::LazyList< cds::gc::DHP, key_val,
             typename cc::lazy_list::make_traits<
                 co::compare< compare >
             >::type
-        >   LazyList_PTB_cmp_stdAlloc;
+        >   LazyList_DHP_cmp_stdAlloc;
 
-        typedef cc::LazyList< cds::gc::PTB, key_val,
+        typedef cc::LazyList< cds::gc::DHP, key_val,
             typename cc::lazy_list::make_traits<
                 co::compare< compare >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   LazyList_PTB_cmp_stdAlloc_seqcst;
+        >   LazyList_DHP_cmp_stdAlloc_seqcst;
 
-        typedef cc::LazyList< cds::gc::PTB, key_val,
+        typedef cc::LazyList< cds::gc::DHP, key_val,
             typename cc::lazy_list::make_traits<
                 co::compare< compare >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   LazyList_PTB_cmp_michaelAlloc;
+        >   LazyList_DHP_cmp_michaelAlloc;
 
-        typedef cc::LazyList< cds::gc::PTB, key_val,
+        typedef cc::LazyList< cds::gc::DHP, key_val,
             typename cc::lazy_list::make_traits<
                 co::less< less >
             >::type
-        >   LazyList_PTB_less_stdAlloc;
+        >   LazyList_DHP_less_stdAlloc;
 
-        typedef cc::LazyList< cds::gc::PTB, key_val,
+        typedef cc::LazyList< cds::gc::DHP, key_val,
             typename cc::lazy_list::make_traits<
                 co::less< less >
                 ,co::memory_model< co::v::sequential_consistent >
             >::type
-        >   LazyList_PTB_less_stdAlloc_seqcst;
+        >   LazyList_DHP_less_stdAlloc_seqcst;
 
-        typedef cc::LazyList< cds::gc::PTB, key_val,
+        typedef cc::LazyList< cds::gc::DHP, key_val,
             typename cc::lazy_list::make_traits<
                 co::less< less >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
-        >   LazyList_PTB_less_michaelAlloc;
+        >   LazyList_DHP_less_michaelAlloc;
 
         // RCU
         typedef cc::LazyList< rcu_gpi, key_val,
@@ -1205,38 +1202,38 @@ namespace set2 {
             >::type
         >   MichaelSet_Lazy_HP_less_michaelAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_PTB_cmp_stdAlloc,
+        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelSet_Lazy_PTB_cmp_stdAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_PTB_cmp_stdAlloc_seqcst,
+        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_cmp_stdAlloc_seqcst,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelSet_Lazy_PTB_cmp_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_PTB_cmp_michaelAlloc,
+        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_cmp_michaelAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >
             >::type
         >   MichaelSet_Lazy_PTB_cmp_michaelAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_PTB_less_stdAlloc,
+        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_less_stdAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelSet_Lazy_PTB_less_stdAlloc;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_PTB_less_stdAlloc_seqcst,
+        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_less_stdAlloc_seqcst,
             typename cc::michael_set::make_traits<
                 co::hash< hash >
             >::type
         >   MichaelSet_Lazy_PTB_less_stdAlloc_seqcst;
 
-        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_PTB_less_michaelAlloc,
+        typedef cc::MichaelHashSet< cds::gc::PTB, LazyList_DHP_less_michaelAlloc,
             typename cc::michael_set::make_traits<
                 co::hash< hash >,
                 co::allocator< memory::MichaelAllocator<int> >