From 880b263082f2ec708ae821981b6ceb14fb4bb9b3 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Fri, 14 Nov 2014 14:53:03 +0300
Subject: [PATCH] rename GC sources

---
 projects/Win/vc12/cds.vcxproj         |  6 +++---
 projects/Win/vc12/cds.vcxproj.filters | 18 +++++++++---------
 projects/source.libcds.mk             |  5 +++--
 src/{ptb_gc.cpp => dhp_gc.cpp}        |  0
 src/{hzp_const.h => hp_const.h}       |  6 +++---
 src/{hzp_gc.cpp => hp_gc.cpp}         |  2 +-
 6 files changed, 19 insertions(+), 18 deletions(-)
 rename src/{ptb_gc.cpp => dhp_gc.cpp} (100%)
 rename src/{hzp_const.h => hp_const.h} (89%)
 rename src/{hzp_gc.cpp => hp_gc.cpp} (99%)

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index cf1ef383..c78c9cc7 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -619,11 +619,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\src\dhp_gc.cpp" />
     <ClCompile Include="..\..\..\src\dllmain.cpp" />
-    <ClCompile Include="..\..\..\src\hzp_gc.cpp" />
+    <ClCompile Include="..\..\..\src\hp_gc.cpp" />
     <ClCompile Include="..\..\..\src\init.cpp" />
     <ClCompile Include="..\..\..\src\michael_heap.cpp" />
-    <ClCompile Include="..\..\..\src\ptb_gc.cpp" />
     <ClCompile Include="..\..\..\src\topology_hpux.cpp" />
     <ClCompile Include="..\..\..\src\topology_linux.cpp" />
     <ClCompile Include="..\..\..\src\topology_osx.cpp" />
@@ -818,7 +818,6 @@
     <ClInclude Include="..\..\..\cds\urcu\options.h" />
     <ClInclude Include="..\..\..\cds\urcu\signal_buffered.h" />
     <ClInclude Include="..\..\..\cds\urcu\signal_threaded.h" />
-    <ClInclude Include="..\..\..\src\hzp_const.h" />
     <ClInclude Include="..\..\..\cds\init.h" />
     <ClInclude Include="..\..\..\cds\refcounter.h" />
     <ClInclude Include="..\..\..\cds\version.h" />
@@ -965,6 +964,7 @@
     <ClInclude Include="..\..\..\cds\container\details\make_lazy_list.h" />
     <ClInclude Include="..\..\..\cds\container\details\make_michael_kvlist.h" />
     <ClInclude Include="..\..\..\cds\container\details\make_michael_list.h" />
+    <ClInclude Include="..\..\..\src\hp_const.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index bee42d54..5ce38054 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -159,18 +159,12 @@
     <ClCompile Include="..\..\..\src\dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\hzp_gc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\init.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\michael_heap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ptb_gc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\topology_hpux.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -186,11 +180,14 @@
     <ClCompile Include="..\..\..\src\topology_osx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\hp_gc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\dhp_gc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\hzp_const.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\init.h">
       <Filter>Header Files\cds</Filter>
     </ClInclude>
@@ -1190,5 +1187,8 @@
     <ClInclude Include="..\..\..\cds\gc\hp\hp_impl.h">
       <Filter>Header Files\cds\gc\hp</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\hp_const.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/source.libcds.mk b/projects/source.libcds.mk
index b823c3af..ba2b1b1f 100644
--- a/projects/source.libcds.mk
+++ b/projects/source.libcds.mk
@@ -1,6 +1,7 @@
-CDS_SOURCES=src/hzp_gc.cpp \
+CDS_SOURCES= \
+         src/hp_gc.cpp \
          src/init.cpp \
-         src/ptb_gc.cpp \
+         src/dhp_gc.cpp \
          src/urcu_gp.cpp \
          src/urcu_sh.cpp \
          src/michael_heap.cpp \
diff --git a/src/ptb_gc.cpp b/src/dhp_gc.cpp
similarity index 100%
rename from src/ptb_gc.cpp
rename to src/dhp_gc.cpp
diff --git a/src/hzp_const.h b/src/hp_const.h
similarity index 89%
rename from src/hzp_const.h
rename to src/hp_const.h
index af10977e..71359d95 100644
--- a/src/hzp_const.h
+++ b/src/hp_const.h
@@ -1,10 +1,10 @@
 //$$CDS-header$$
 
-#ifndef __CDSIMPL_HZP_CONST_H
-#define __CDSIMPL_HZP_CONST_H
+#ifndef __CDSIMPL_HP_CONST_H
+#define __CDSIMPL_HP_CONST_H
 
 /*
-    File: hzp_const.h
+    File: hp_const.h
 
     Michael's Hazard Pointer reclamation schema global constants
     Gidenstam's reclamation schema global constants
diff --git a/src/hzp_gc.cpp b/src/hp_gc.cpp
similarity index 99%
rename from src/hzp_gc.cpp
rename to src/hp_gc.cpp
index a8bb004d..5bfbee4f 100644
--- a/src/hzp_gc.cpp
+++ b/src/hp_gc.cpp
@@ -12,7 +12,7 @@
 #include <cds/gc/hp/hp.h>
 
 #include <algorithm>    // std::sort
-#include "hzp_const.h"
+#include "hp_const.h"
 
 #define    CDS_HAZARDPTR_STATISTIC( _x )    if ( m_bStatEnabled ) { _x; }
 
-- 
2.34.1