From f6c63698d567fc5c70556130c5ba9bed9a18d5b6 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Thu, 18 Sep 2014 19:29:13 +0400
Subject: [PATCH] Move cds/backoff_strategy.h to cds/algo/backoff_strategy.h

---
 cds/{ => algo}/backoff_strategy.h     | 8 ++++----
 cds/algo/flat_combining.h             | 2 +-
 cds/intrusive/base.h                  | 2 +-
 cds/lock/spinlock.h                   | 2 +-
 cds/urcu/details/gpb.h                | 2 +-
 cds/urcu/details/gpi.h                | 2 +-
 cds/urcu/details/gpt.h                | 2 +-
 cds/urcu/details/sig_buffered.h       | 2 +-
 cds/urcu/details/sig_threaded.h       | 2 +-
 cds/urcu/dispose_thread.h             | 1 -
 projects/Win/vc12/cds.vcxproj         | 2 +-
 projects/Win/vc12/cds.vcxproj.filters | 6 +++---
 12 files changed, 16 insertions(+), 17 deletions(-)
 rename cds/{ => algo}/backoff_strategy.h (98%)

diff --git a/cds/backoff_strategy.h b/cds/algo/backoff_strategy.h
similarity index 98%
rename from cds/backoff_strategy.h
rename to cds/algo/backoff_strategy.h
index b36df538..24852bba 100644
--- a/cds/backoff_strategy.h
+++ b/cds/algo/backoff_strategy.h
@@ -167,7 +167,7 @@ namespace cds {
             example, you may define two \p exponential back-offs that is the best for your task A and B:
             \code
 
-            #include <cds/backoff_strategy.h>
+            #include <cds/algo/backoff_strategy.h>
             namespace bkoff = cds::backoff;
 
             struct tagA ;   // tag to select task A implementation
@@ -189,7 +189,7 @@ namespace cds {
 
             Another way of solving this problem is subclassing \p exponential back-off class:
             \code
-            #include <cds/backoff_strategy.h>
+            #include <cds/algo/backoff_strategy.h>
             namespace bkoff = cds::backoff;
             typedef bkoff::exponential<bkoff::hint, bkoff::yield>   base_bkoff;
 
@@ -309,7 +309,7 @@ namespace cds {
             example, you may define two \p delay back-offs for 5 and 10 ms timeout:
             \code
 
-            #include <cds/backoff_strategy.h>
+            #include <cds/algo/backoff_strategy.h>
             namespace bkoff = cds::backoff;
 
             struct ms5  ;   // tag to select 5ms
@@ -326,7 +326,7 @@ namespace cds {
 
             Another way of solving this problem is subclassing \p delay back-off class:
             \code
-            #include <cds/backoff_strategy.h>
+            #include <cds/algo/backoff_strategy.h>
             namespace bkoff = cds::backoff;
             typedef bkoff::delay<> delay_bkoff;
 
diff --git a/cds/algo/flat_combining.h b/cds/algo/flat_combining.h
index d5b780b6..4499dc03 100644
--- a/cds/algo/flat_combining.h
+++ b/cds/algo/flat_combining.h
@@ -5,7 +5,7 @@
 
 #include <cds/cxx11_atomic.h>
 #include <cds/details/allocator.h>
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 #include <cds/lock/spinlock.h>
 #include <cds/details/std/mutex.h>  // lock_guard
 #include <cds/opt/options.h>
diff --git a/cds/intrusive/base.h b/cds/intrusive/base.h
index 1247f4b8..8fa8e4f6 100644
--- a/cds/intrusive/base.h
+++ b/cds/intrusive/base.h
@@ -5,7 +5,7 @@
 
 #include <cds/intrusive/node_traits.h>
 #include <cds/details/allocator.h>
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 
 namespace cds {
 
diff --git a/cds/lock/spinlock.h b/cds/lock/spinlock.h
index 19be1a4f..e12e9644 100644
--- a/cds/lock/spinlock.h
+++ b/cds/lock/spinlock.h
@@ -14,7 +14,7 @@
 
 #include <cds/cxx11_atomic.h>
 #include <cds/os/thread.h>
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 #include <cds/lock/scoped_lock.h>
 
 #include <cds/details/noncopyable.h>
diff --git a/cds/urcu/details/gpb.h b/cds/urcu/details/gpb.h
index 5df1fcbc..b5d85b49 100644
--- a/cds/urcu/details/gpb.h
+++ b/cds/urcu/details/gpb.h
@@ -4,7 +4,7 @@
 #define _CDS_URCU_DETAILS_GPB_H
 
 #include <cds/urcu/details/gp.h>
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 #include <cds/container/vyukov_mpmc_cycle_queue.h>
 
 #include <cds/details/std/mutex.h>
diff --git a/cds/urcu/details/gpi.h b/cds/urcu/details/gpi.h
index 4d9a852d..2ab6553f 100644
--- a/cds/urcu/details/gpi.h
+++ b/cds/urcu/details/gpi.h
@@ -4,7 +4,7 @@
 #define _CDS_URCU_DETAILS_GPI_H
 
 #include <cds/urcu/details/gp.h>
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 #include <cds/lock/scoped_lock.h>
 
 #include <cds/details/std/mutex.h>
diff --git a/cds/urcu/details/gpt.h b/cds/urcu/details/gpt.h
index c741ea2e..994e50a6 100644
--- a/cds/urcu/details/gpt.h
+++ b/cds/urcu/details/gpt.h
@@ -5,7 +5,7 @@
 
 #include <cds/urcu/details/gp.h>
 #include <cds/urcu/dispose_thread.h>
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 #include <cds/container/vyukov_mpmc_cycle_queue.h>
 
 namespace cds { namespace urcu {
diff --git a/cds/urcu/details/sig_buffered.h b/cds/urcu/details/sig_buffered.h
index 81f88013..5ab1ad25 100644
--- a/cds/urcu/details/sig_buffered.h
+++ b/cds/urcu/details/sig_buffered.h
@@ -6,7 +6,7 @@
 #include <cds/urcu/details/sh.h>
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
 
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 #include <cds/container/vyukov_mpmc_cycle_queue.h>
 
 #include <cds/details/std/mutex.h>
diff --git a/cds/urcu/details/sig_threaded.h b/cds/urcu/details/sig_threaded.h
index e4820943..9056e894 100644
--- a/cds/urcu/details/sig_threaded.h
+++ b/cds/urcu/details/sig_threaded.h
@@ -7,7 +7,7 @@
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
 
 #include <cds/urcu/dispose_thread.h>
-#include <cds/backoff_strategy.h>
+#include <cds/algo/backoff_strategy.h>
 #include <cds/container/vyukov_mpmc_cycle_queue.h>
 
 namespace cds { namespace urcu {
diff --git a/cds/urcu/dispose_thread.h b/cds/urcu/dispose_thread.h
index 3c1619c1..5a8686fb 100644
--- a/cds/urcu/dispose_thread.h
+++ b/cds/urcu/dispose_thread.h
@@ -3,7 +3,6 @@
 #ifndef _CDS_URCU_DISPOSE_THREAD_H
 #define _CDS_URCU_DISPOSE_THREAD_H
 
-//#include <cds/backoff_strategy.h>
 #include <cds/details/std/thread.h>
 #include <cds/details/std/mutex.h>
 #include <cds/details/std/condition_variable.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index ed9e83be..2c7c3604 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -632,6 +632,7 @@
     <ClCompile Include="..\..\..\src\urcu_sh.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\cds\algo\backoff_strategy.h" />
     <ClInclude Include="..\..\..\cds\algo\base.h" />
     <ClInclude Include="..\..\..\cds\algo\elimination.h" />
     <ClInclude Include="..\..\..\cds\algo\elimination_opt.h" />
@@ -808,7 +809,6 @@
     <ClInclude Include="..\..\..\cds\urcu\signal_buffered.h" />
     <ClInclude Include="..\..\..\cds\urcu\signal_threaded.h" />
     <ClInclude Include="..\..\..\src\hzp_const.h" />
-    <ClInclude Include="..\..\..\cds\backoff_strategy.h" />
     <ClInclude Include="..\..\..\cds\bitop.h" />
     <ClInclude Include="..\..\..\cds\init.h" />
     <ClInclude Include="..\..\..\cds\int_algo.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 5df3e497..7ac92ccf 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -194,9 +194,6 @@
     <ClInclude Include="..\..\..\src\hzp_const.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\backoff_strategy.h">
-      <Filter>Header Files\cds</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\bitop.h">
       <Filter>Header Files\cds</Filter>
     </ClInclude>
@@ -1322,5 +1319,8 @@
     <ClInclude Include="..\..\..\cds\algo\flat_combining.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\algo\backoff_strategy.h">
+      <Filter>Header Files\cds\algo</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.34.1