rename michael_list_ptb.h to michael_list_dhp.h

diff --git a/cds/container/impl/michael_list.h b/cds/container/impl/michael_list.h
index 7ef71ec7e4d9b7ecb9f0aabdb6ab8678dcdaf254..1ea661179b2897e3b985c621d35c6942ca0c8efe 100644 (file)
--- a/cds/container/impl/michael_list.h
+++ b/cds/container/impl/michael_list.h
@@ -82,7 +82,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/michael_list_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/container/michael_list_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/container/michael_list_dhp.h> \endcode
         - for \ref cds_urcu_desc "RCU": \code #include <cds/container/michael_list_rcu.h> \endcode
         - for gc::nogc: \code #include <cds/container/michael_list_nogc.h> \endcode
     */

diff --git a/cds/container/michael_kvlist_ptb.h b/cds/container/michael_kvlist_ptb.h
index 0090dc5cba5b7b7124b56d88982913b8ec988009..aef357f9ef27de288a96a0148167e8618fcad20d 100644 (file)
--- a/cds/container/michael_kvlist_ptb.h
+++ b/cds/container/michael_kvlist_ptb.h
@@ -4,7 +4,7 @@
 #define __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H
 
 #include <cds/container/details/michael_list_base.h>
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/container/impl/michael_kvlist.h>
 

diff --git a/cds/container/michael_list_dhp.h b/cds/container/michael_list_dhp.h
new file mode 100644 (file)
index 0000000..d89e4df
--- /dev/null
+++ b/cds/container/michael_list_dhp.h
@@ -0,0 +1,11 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_MICHAEL_LIST_DHP_H
+#define __CDS_CONTAINER_MICHAEL_LIST_DHP_H
+
+#include <cds/container/details/michael_list_base.h>
+#include <cds/intrusive/michael_list_dhp.h>
+#include <cds/container/details/make_michael_list.h>
+#include <cds/container/impl/michael_list.h>
+
+#endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_DHP_H

diff --git a/cds/container/michael_list_ptb.h b/cds/container/michael_list_ptb.h
deleted file mode 100644 (file)
index c63ec6b..0000000
--- a/cds/container/michael_list_ptb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_MICHAEL_LIST_PTB_H
-#define __CDS_CONTAINER_MICHAEL_LIST_PTB_H
-
-#include <cds/container/details/michael_list_base.h>
-#include <cds/intrusive/michael_list_ptb.h>
-#include <cds/container/details/make_michael_list.h>
-#include <cds/container/impl/michael_list.h>
-
-#endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_PTB_H

diff --git a/cds/container/michael_set.h b/cds/container/michael_set.h
index 49627a999cb98ecebfc029ab3d0221c01d5112d1..acc6271967f1fd4bdf7afddb308eb72a6e5a54a2 100644 (file)
--- a/cds/container/michael_set.h
+++ b/cds/container/michael_set.h
@@ -127,7 +127,7 @@ namespace cds { namespace container {
         MichaelList as a bucket type. Also, for ordered list we should develop a comparator for our \p Foo
         struct.
         \code
-        #include <cds/container/michael_list_ptb.h>
+        #include <cds/container/michael_list_dhp.h>
         #include <cds/container/michael_set.h>
 
         namespace cc = cds::container;

diff --git a/cds/intrusive/impl/michael_list.h b/cds/intrusive/impl/michael_list.h
index 43addd16914e558113ee53b705d84f350f08eada..20d52466881cf5b1b98a66c2fd2c485a6922c767 100644 (file)
--- a/cds/intrusive/impl/michael_list.h
+++ b/cds/intrusive/impl/michael_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/michael_list_hp.h> \endcode
-        - for gc::PTB: \code #include <cds/intrusive/michael_list_ptb.h> \endcode
+        - for gc::DHP: \code #include <cds/intrusive/michael_list_dhp.h> \endcode
         - for gc::HRC: \code #include <cds/intrusive/michael_list_hrc.h> \endcode
         - for \ref cds_urcu_gc "RCU type" - see \ref cds_intrusive_MichaelList_rcu "RCU-based MichaelList"
         - for gc::nogc: \code #include <cds/intrusive/michael_list_nogc.h> \endcode
@@ -102,7 +102,7 @@ namespace cds { namespace intrusive {
         Example for gc::PTB and base hook:
         \code
         // Include GC-related Michael's list specialization
-        #include <cds/intrusive/michael_list_ptb.h>
+        #include <cds/intrusive/michael_list_dhp.h>
 
         // Data stored in Michael's list
         struct my_data: public cds::intrusive::michael_list::node< cds::gc::PTB >
@@ -147,7 +147,7 @@ namespace cds { namespace intrusive {
         Equivalent option-based code:
         \code
         // GC-related specialization
-        #include <cds/intrusive/michael_list_ptb.h>
+        #include <cds/intrusive/michael_list_dhp.h>
 
         struct my_data {
             // see above

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

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

diff --git a/cds/intrusive/michael_set.h b/cds/intrusive/michael_set.h
index 51ebeeb9170adf696a33f68771ba20c77291ae46..be8cf1d069be8a57fe5fba2d4fd53bf0becaeeb7 100644 (file)
--- a/cds/intrusive/michael_set.h
+++ b/cds/intrusive/michael_set.h
@@ -132,7 +132,7 @@ namespace cds { namespace intrusive {
         Like other intrusive containers, you may build several containers on single item structure:
         \code
         #include <cds/intrusive/michael_list_hp.h>
-        #include <cds/intrusive/michael_list_ptb.h>
+        #include <cds/intrusive/michael_list_dhp.h>
         #include <cds/intrusive/michael_set.h>
 
         struct tag_key1_idx;

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index a00b58211c45497c8ed27da48ec09616e020f7e9..4df3bea032a0ebb3ce71f116c84dbb0605ae0692 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -685,6 +685,7 @@
     <ClInclude Include="..\..\..\cds\container\lazy_kvlist_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\lazy_list_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_kvlist_rcu.h" />\r
+    <ClInclude Include="..\..\..\cds\container\michael_list_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_map_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_set_rcu.h" />\r
@@ -763,6 +764,7 @@
     <ClInclude Include="..\..\..\cds\intrusive\impl\michael_list.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\impl\skip_list.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
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\mspriority_queue.h" />\r
@@ -935,7 +937,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_hrc.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\intrusive\michael_list_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_set.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_set_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\moir_queue.h" />\r
@@ -966,7 +967,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_list_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_hrc.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_list_nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\container\michael_list_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_map_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_set.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 287f6d9ab28ff68f17075d1f941ffe20482c9214..85d01e757b807e7bdc070c2e19ab1140961e1413 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -560,9 +560,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\michael_list_nogc.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\intrusive\michael_list_ptb.h">\r
-      <Filter>Header Files\cds\intrusive</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\intrusive\michael_set.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
@@ -653,9 +650,6 @@
     <ClInclude Include="..\..\..\cds\container\michael_list_nogc.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\container\michael_list_ptb.h">\r
-      <Filter>Header Files\cds\container</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\container\michael_map.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
@@ -1259,5 +1253,11 @@
     <ClInclude Include="..\..\..\cds\gc\dhp.h">\r
       <Filter>Header Files\cds\gc</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\michael_list_dhp.h">\r
+      <Filter>Header Files\cds\container</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\intrusive\michael_list_dhp.h">\r
+      <Filter>Header Files\cds\intrusive</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp b/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp
index a09ae3cb556763188bb2f1c48c34941c6fb0891b..113b82456194fd0890493222251ae5fe4a54c6ac 100644 (file)
--- a/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp
+++ b/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "map/hdr_map.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 #include <cds/container/split_list_map.h>
 
 namespace map {

diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp
index ee984bf19bc9e1c822ac1f288bf1819a8dcd4215..fed0ec88b4ce7e42cd4f3d7523e08e4215e3711c 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "ordered_list/hdr_intrusive_michael.h"
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 
 namespace ordlist {
     void IntrusiveMichaelListHeaderTest::PTB_base_cmp()

diff --git a/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp b/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp
index ef8cfe701dc6013a7e9b4f7f0966fa4a211f81b6..0dfb8ac0b7084b080bc9b00f894d824416794af1 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp
+++ b/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "ordered_list/hdr_michael.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 
 namespace ordlist {
     namespace {

diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp
index d079a217ea12509cc4b7ed0a6fcb18b9bde27cd9..016f125ed619b2234e59062c473efe59924255ca 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 #include <cds/intrusive/michael_set.h>
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
index f9c30ed8cd93213c130880f929e1355260678750..01181eb2a01a9fa01f4aa01dbc48465d4236d361 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/michael_list_ptb.h>
+#include <cds/intrusive/michael_list_dhp.h>
 #include <cds/intrusive/split_list.h>
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_michael_set_ptb.cpp b/tests/test-hdr/set/hdr_michael_set_ptb.cpp
index 0b292ec131e3da44c89cbebd3c9e4b2162270bca..0d4305e0f424c1a64febeec77c3cbb1d6ead8f49 100644 (file)
--- a/tests/test-hdr/set/hdr_michael_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_michael_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_set.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 #include <cds/container/michael_set.h>
 
 namespace set {

diff --git a/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp b/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
index 38e7f7a5002aea7fdf35e74b934a354010565c63..058c9469e63a35771b2b9d778c29eafd25640309 100644 (file)
--- a/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
+++ b/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "set/hdr_set.h"
-#include <cds/container/michael_list_ptb.h>
+#include <cds/container/michael_list_dhp.h>
 #include <cds/container/split_list_set.h>
 
 namespace set {

diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h
index a2baa7fe0af7a41fb3e6cb611d420173490b1dbb..6b5d5de3ba5bf92bbb24acb44153cdcef651dabb 100644 (file)
--- a/tests/unit/set2/set_types.h
+++ b/tests/unit/set2/set_types.h
@@ -11,7 +11,7 @@
 
 #include <cds/container/michael_list_hp.h>
 #include <cds/container/michael_list_hrc.h>
-#include <cds/container/michael_list_ptb.h>
+#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_hrc.h>