From 9d6b5b62532cda918cde958184d346368a368142 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Fri, 14 Nov 2014 14:38:56 +0300
Subject: [PATCH] rearrange cds/gc contents

---
 cds/container/ellen_bintree_map_dhp.h   |  2 +-
 cds/container/ellen_bintree_set_dhp.h   |  2 +-
 cds/gc/dhp.h                            | 16 +++----
 cds/gc/{ptb_decl.h => dhp_decl.h}       | 14 +++---
 cds/gc/{ptb_impl.h => dhp_impl.h}       |  0
 cds/gc/{hzp => hp}/details/hp_alloc.h   |  4 +-
 cds/gc/{hzp => hp}/details/hp_fwd.h     |  0
 cds/gc/{hzp => hp}/details/hp_inline.h  |  0
 cds/gc/{hzp => hp}/details/hp_retired.h |  4 +-
 cds/gc/{hzp => hp}/details/hp_type.h    |  0
 cds/gc/{hzp => hp}/hzp.h                |  8 ++--
 cds/gc/hp_decl.h                        |  2 +-
 cds/gc/ptb.h                            | 10 ----
 cds/threading/details/_common.h         |  2 +-
 projects/Win/vc12/cds.vcxproj           | 17 ++++---
 projects/Win/vc12/cds.vcxproj.filters   | 63 ++++++++++++-------------
 src/hzp_gc.cpp                          |  2 +-
 tests/cppunit/test_main.cpp             |  2 +-
 18 files changed, 65 insertions(+), 83 deletions(-)
 rename cds/gc/{ptb_decl.h => dhp_decl.h} (98%)
 rename cds/gc/{ptb_impl.h => dhp_impl.h} (100%)
 rename cds/gc/{hzp => hp}/details/hp_alloc.h (99%)
 rename cds/gc/{hzp => hp}/details/hp_fwd.h (100%)
 rename cds/gc/{hzp => hp}/details/hp_inline.h (100%)
 rename cds/gc/{hzp => hp}/details/hp_retired.h (97%)
 rename cds/gc/{hzp => hp}/details/hp_type.h (100%)
 rename cds/gc/{hzp => hp}/hzp.h (99%)
 delete mode 100644 cds/gc/ptb.h

diff --git a/cds/container/ellen_bintree_map_dhp.h b/cds/container/ellen_bintree_map_dhp.h
index 91378d43..59ed1e27 100644
--- a/cds/container/ellen_bintree_map_dhp.h
+++ b/cds/container/ellen_bintree_map_dhp.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_ELLEN_BINTREE_MAP_DHP_H
 #define __CDS_CONTAINER_ELLEN_BINTREE_MAP_DHP_H
 
-#include <cds/gc/ptb.h>
+#include <cds/gc/dhp.h>
 #include <cds/container/impl/ellen_bintree_map.h>
 
 #endif // #ifndef __CDS_CONTAINER_ELLEN_BINTREE_MAP_DHP_H
diff --git a/cds/container/ellen_bintree_set_dhp.h b/cds/container/ellen_bintree_set_dhp.h
index beaca96b..3bb3adf1 100644
--- a/cds/container/ellen_bintree_set_dhp.h
+++ b/cds/container/ellen_bintree_set_dhp.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_ELLEN_BINTREE_SET_DHP_H
 #define __CDS_CONTAINER_ELLEN_BINTREE_SET_DHP_H
 
-#include <cds/gc/ptb.h>
+#include <cds/gc/dhp.h>
 #include <cds/container/impl/ellen_bintree_set.h>
 
 #endif // #ifndef __CDS_CONTAINER_ELLEN_BINTREE_SET_DHP_H
diff --git a/cds/gc/dhp.h b/cds/gc/dhp.h
index 89abde52..819f49dc 100644
--- a/cds/gc/dhp.h
+++ b/cds/gc/dhp.h
@@ -1,14 +1,10 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_DHP_H
-#define __CDS_GC_DHP_H
+#ifndef __CDS_GC_PTB_H
+#define __CDS_GC_PTB_H
 
-#include <cds/gc/ptb.h>
+#include <cds/gc/dhp_decl.h>
+#include <cds/gc/dhp_impl.h>
+#include <cds/details/lib.h>
 
-//@cond
-namespace cds { namespace gc {
-    typedef PTB DHP;
-}} // namespace cds::gc
-//@endcond
-
-#endif // #ifndef __CDS_GC_DHP_H
+#endif // #ifndef __CDS_GC_PTB_H
diff --git a/cds/gc/ptb_decl.h b/cds/gc/dhp_decl.h
similarity index 98%
rename from cds/gc/ptb_decl.h
rename to cds/gc/dhp_decl.h
index 34feb395..32499132 100644
--- a/cds/gc/ptb_decl.h
+++ b/cds/gc/dhp_decl.h
@@ -11,7 +11,7 @@ namespace cds { namespace gc {
 
     /// Pass-the-Buck garbage collector
     /**  @ingroup cds_garbage_collector
-        @headerfile cds/gc/ptb.h
+        @headerfile cds/gc/dhp.h
         This class is a wrapper for Pass-the-Buck garbage collector internal implementation.
 
         Sources:
@@ -32,19 +32,19 @@ namespace cds { namespace gc {
 
         /// Atomic reference
         /**
-            @headerfile cds/gc/ptb.h
+            @headerfile cds/gc/dhp.h
         */
         template <typename T> using atomic_ref = atomics::atomic<T *>;
 
         /// Atomic type
         /**
-            @headerfile cds/gc/ptb.h
+            @headerfile cds/gc/dhp.h
         */
         template <typename T> using atomic_type = atomics::atomic<T>;
 
         /// Atomic marked pointer
         /**
-            @headerfile cds/gc/ptb.h
+            @headerfile cds/gc/dhp.h
         */
         template <typename MarkedPtr> using atomic_marked_ptr = atomics::atomic<MarkedPtr>;
 
@@ -53,7 +53,7 @@ namespace cds { namespace gc {
 
         /// Wrapper for ptb::ThreadGC class
         /**
-            @headerfile cds/gc/ptb.h
+            @headerfile cds/gc/dhp.h
             This class performs automatically attaching/detaching Pass-the-Buck GC
             for the current thread.
         */
@@ -86,7 +86,7 @@ namespace cds { namespace gc {
 
         /// Pass-the-Buck guard
         /**
-            @headerfile cds/gc/ptb.h
+            @headerfile cds/gc/dhp.h
             This class is a wrapper for ptb::Guard.
         */
         class Guard: public ptb::Guard
@@ -207,7 +207,7 @@ namespace cds { namespace gc {
 
         /// Array of Pass-the-Buck guards
         /**
-            @headerfile cds/gc/ptb.h
+            @headerfile cds/gc/dhp.h
             This class is a wrapper for ptb::GuardArray template.
             Template parameter \p Count defines the size of PTB array.
         */
diff --git a/cds/gc/ptb_impl.h b/cds/gc/dhp_impl.h
similarity index 100%
rename from cds/gc/ptb_impl.h
rename to cds/gc/dhp_impl.h
diff --git a/cds/gc/hzp/details/hp_alloc.h b/cds/gc/hp/details/hp_alloc.h
similarity index 99%
rename from cds/gc/hzp/details/hp_alloc.h
rename to cds/gc/hp/details/hp_alloc.h
index 83a8772f..2dcadd25 100644
--- a/cds/gc/hzp/details/hp_alloc.h
+++ b/cds/gc/hp/details/hp_alloc.h
@@ -5,8 +5,8 @@
 
 #include <cds/cxx11_atomic.h>
 #include <cds/details/allocator.h>
-#include <cds/gc/hzp/details/hp_fwd.h>
-#include <cds/gc/hzp/details/hp_type.h>
+#include <cds/gc/hp/details/hp_fwd.h>
+#include <cds/gc/hp/details/hp_type.h>
 
 //@cond
 namespace cds {
diff --git a/cds/gc/hzp/details/hp_fwd.h b/cds/gc/hp/details/hp_fwd.h
similarity index 100%
rename from cds/gc/hzp/details/hp_fwd.h
rename to cds/gc/hp/details/hp_fwd.h
diff --git a/cds/gc/hzp/details/hp_inline.h b/cds/gc/hp/details/hp_inline.h
similarity index 100%
rename from cds/gc/hzp/details/hp_inline.h
rename to cds/gc/hp/details/hp_inline.h
diff --git a/cds/gc/hzp/details/hp_retired.h b/cds/gc/hp/details/hp_retired.h
similarity index 97%
rename from cds/gc/hzp/details/hp_retired.h
rename to cds/gc/hp/details/hp_retired.h
index fc32ec6a..6b6dd4a2 100644
--- a/cds/gc/hzp/details/hp_retired.h
+++ b/cds/gc/hp/details/hp_retired.h
@@ -3,8 +3,8 @@
 #ifndef __CDS_GC_HZP_DETAILS_HP_RETIRED_H
 #define __CDS_GC_HZP_DETAILS_HP_RETIRED_H
 
-#include <cds/gc/hzp/details/hp_fwd.h>
-#include <cds/gc/hzp/details/hp_type.h>
+#include <cds/gc/hp/details/hp_fwd.h>
+#include <cds/gc/hp/details/hp_type.h>
 
 #include <cds/details/bounded_array.h>
 
diff --git a/cds/gc/hzp/details/hp_type.h b/cds/gc/hp/details/hp_type.h
similarity index 100%
rename from cds/gc/hzp/details/hp_type.h
rename to cds/gc/hp/details/hp_type.h
diff --git a/cds/gc/hzp/hzp.h b/cds/gc/hp/hzp.h
similarity index 99%
rename from cds/gc/hzp/hzp.h
rename to cds/gc/hp/hzp.h
index b92a5a41..7e291659 100644
--- a/cds/gc/hzp/hzp.h
+++ b/cds/gc/hp/hzp.h
@@ -6,9 +6,9 @@
 #include <vector>
 #include <cds/cxx11_atomic.h>
 #include <cds/os/thread.h>
-#include <cds/gc/hzp/details/hp_fwd.h>
-#include <cds/gc/hzp/details/hp_alloc.h>
-#include <cds/gc/hzp/details/hp_retired.h>
+#include <cds/gc/hp/details/hp_fwd.h>
+#include <cds/gc/hp/details/hp_alloc.h>
+#include <cds/gc/hp/details/hp_retired.h>
 
 #if CDS_COMPILER == CDS_COMPILER_MSVC
 #   pragma warning(push)
@@ -646,7 +646,7 @@ namespace cds {
 }}  // namespace cds::gc
 
 // Inlines
-#include <cds/gc/hzp/details/hp_inline.h>
+#include <cds/gc/hp/details/hp_inline.h>
 
 #if CDS_COMPILER == CDS_COMPILER_MSVC
 #   pragma warning(pop)
diff --git a/cds/gc/hp_decl.h b/cds/gc/hp_decl.h
index 2b92a540..76f0aba2 100644
--- a/cds/gc/hp_decl.h
+++ b/cds/gc/hp_decl.h
@@ -4,7 +4,7 @@
 #define __CDS_GC_HP_DECL_H
 
 #include <stdexcept>    // overflow_error
-#include <cds/gc/hzp/hzp.h>
+#include <cds/gc/hp/hp.h>
 #include <cds/details/marked_ptr.h>
 
 namespace cds { namespace gc {
diff --git a/cds/gc/ptb.h b/cds/gc/ptb.h
deleted file mode 100644
index 8096695d..00000000
--- a/cds/gc/ptb.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_GC_PTB_H
-#define __CDS_GC_PTB_H
-
-#include <cds/gc/ptb_decl.h>
-#include <cds/gc/ptb_impl.h>
-#include <cds/details/lib.h>
-
-#endif // #ifndef __CDS_GC_PTB_H
diff --git a/cds/threading/details/_common.h b/cds/threading/details/_common.h
index 619a01f2..b31823a4 100644
--- a/cds/threading/details/_common.h
+++ b/cds/threading/details/_common.h
@@ -4,7 +4,7 @@
 #define __CDS_THREADING__COMMON_H
 
 #include <cds/gc/hp_decl.h>
-#include <cds/gc/ptb_decl.h>
+#include <cds/gc/dhp_decl.h>
 
 #include <cds/urcu/details/gp_decl.h>
 #include <cds/urcu/details/sh_decl.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 70e78e5c..d242c1e1 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -735,12 +735,18 @@
     <ClInclude Include="..\..\..\cds\details\lib.h" />
     <ClInclude Include="..\..\..\cds\details\static_functor.h" />
     <ClInclude Include="..\..\..\cds\gc\dhp.h" />
+    <ClInclude Include="..\..\..\cds\gc\dhp_decl.h" />
+    <ClInclude Include="..\..\..\cds\gc\dhp_impl.h" />
     <ClInclude Include="..\..\..\cds\gc\gc_fwd.h" />
     <ClInclude Include="..\..\..\cds\gc\guarded_ptr.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_alloc.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_fwd.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_inline.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_retired.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_type.h" />
+    <ClInclude Include="..\..\..\cds\gc\hp\hzp.h" />
     <ClInclude Include="..\..\..\cds\gc\hp_decl.h" />
     <ClInclude Include="..\..\..\cds\gc\hp_impl.h" />
-    <ClInclude Include="..\..\..\cds\gc\ptb_decl.h" />
-    <ClInclude Include="..\..\..\cds\gc\ptb_impl.h" />
     <ClInclude Include="..\..\..\cds\intrusive\basket_queue.h" />
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\base.h" />
@@ -831,13 +837,6 @@
     <ClInclude Include="..\..\..\cds\gc\default_gc.h" />
     <ClInclude Include="..\..\..\cds\gc\hp.h" />
     <ClInclude Include="..\..\..\cds\gc\nogc.h" />
-    <ClInclude Include="..\..\..\cds\gc\ptb.h" />
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_alloc.h" />
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_fwd.h" />
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_inline.h" />
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_retired.h" />
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_type.h" />
-    <ClInclude Include="..\..\..\cds\gc\hzp\hzp.h" />
     <ClInclude Include="..\..\..\cds\gc\ptb\ptb.h" />
     <ClInclude Include="..\..\..\cds\gc\details\retired_ptr.h" />
     <ClInclude Include="..\..\..\cds\user_setup\allocator.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index b9dcf1e0..75906e30 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -18,9 +18,6 @@
     <Filter Include="Header Files\cds\gc">
       <UniqueIdentifier>{a3c9928d-5261-4593-a8b9-728235f7056f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\cds\gc\hzp">
-      <UniqueIdentifier>{21a6c665-7381-45b8-9f03-b21f3da5503d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\cds\gc\ptb">
       <UniqueIdentifier>{53d28ee4-5fe9-4fa1-a617-53d8b0628eac}</UniqueIdentifier>
     </Filter>
@@ -154,6 +151,9 @@
     <Filter Include="Header Files\cds\container\impl">
       <UniqueIdentifier>{0a2328b4-ff6f-4afb-8de0-9884ae172fa9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\cds\gc\hp">
+      <UniqueIdentifier>{043c4eba-3bd4-4226-b214-e26f18b422a1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\dllmain.cpp">
@@ -248,27 +248,6 @@
     <ClInclude Include="..\..\..\cds\gc\nogc.h">
       <Filter>Header Files\cds\gc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\ptb.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_alloc.h">
-      <Filter>Header Files\cds\gc\hzp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_fwd.h">
-      <Filter>Header Files\cds\gc\hzp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_inline.h">
-      <Filter>Header Files\cds\gc\hzp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_retired.h">
-      <Filter>Header Files\cds\gc\hzp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_type.h">
-      <Filter>Header Files\cds\gc\hzp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\hzp\hzp.h">
-      <Filter>Header Files\cds\gc\hzp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\gc\ptb\ptb.h">
       <Filter>Header Files\cds\gc\ptb</Filter>
     </ClInclude>
@@ -665,12 +644,6 @@
     <ClInclude Include="..\..\..\cds\gc\hp_impl.h">
       <Filter>Header Files\cds\gc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\ptb_decl.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\ptb_impl.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic.h">
       <Filter>Header Files\cds\compiler</Filter>
     </ClInclude>
@@ -1157,9 +1130,6 @@
     <ClInclude Include="..\..\..\cds\container\details\split_list_base.h">
       <Filter>Header Files\cds\container\details</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\gc\dhp.h">
-      <Filter>Header Files\cds\gc</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\container\michael_list_dhp.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
@@ -1196,5 +1166,32 @@
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_dhp.h">
       <Filter>Header Files\cds\container</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\dhp.h">
+      <Filter>Header Files\cds\gc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\dhp_decl.h">
+      <Filter>Header Files\cds\gc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\dhp_impl.h">
+      <Filter>Header Files\cds\gc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_alloc.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_fwd.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_inline.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_retired.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\details\hp_type.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\gc\hp\hzp.h">
+      <Filter>Header Files\cds\gc\hp</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/hzp_gc.cpp b/src/hzp_gc.cpp
index e171fbcc..a8bb004d 100644
--- a/src/hzp_gc.cpp
+++ b/src/hzp_gc.cpp
@@ -9,7 +9,7 @@
         2008.02.10    Maxim.Khiszinsky    Created
 */
 
-#include <cds/gc/hzp/hzp.h>
+#include <cds/gc/hp/hp.h>
 
 #include <algorithm>    // std::sort
 #include "hzp_const.h"
diff --git a/tests/cppunit/test_main.cpp b/tests/cppunit/test_main.cpp
index 3ae3362c..452c0503 100644
--- a/tests/cppunit/test_main.cpp
+++ b/tests/cppunit/test_main.cpp
@@ -28,7 +28,7 @@
 
 #include <cds/init.h>
 #include <cds/gc/hp.h>
-#include <cds/gc/ptb.h>
+#include <cds/gc/dhp.h>
 #include <cds/urcu/general_instant.h>
 #include <cds/urcu/general_buffered.h>
 #include <cds/urcu/general_threaded.h>
-- 
2.34.1