From dca6f3ea44d8fb0aaa1d4ae6761694b4ae9d0965 Mon Sep 17 00:00:00 2001
From: James Sedgwick <jsedgwick@fb.com>
Date: Wed, 18 Oct 2017 09:44:09 -0700
Subject: [PATCH] move futures/DrivableExecutor to executors/DrivableExecutor

Summary: as title

Reviewed By: yfeldblum

Differential Revision: D6062437

fbshipit-source-id: 4f99e779e280fdb0b1f035013caff18764e86ab5
---
 folly/Makefile.am                               | 2 +-
 folly/{futures => executors}/DrivableExecutor.h | 0
 folly/executors/NotificationQueueExecutor.h     | 2 +-
 folly/futures/Future.h                          | 2 +-
 folly/futures/ManualExecutor.h                  | 2 +-
 folly/futures/README.md                         | 2 +-
 folly/futures/test/ViaTest.cpp                  | 2 +-
 folly/io/async/EventBase.h                      | 3 +--
 8 files changed, 7 insertions(+), 8 deletions(-)
 rename folly/{futures => executors}/DrivableExecutor.h (100%)

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 94b417c2..7159baea 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -88,6 +88,7 @@ nobase_follyinclude_HEADERS = \
 	executors/BlockingQueue.h \
 	executors/CPUThreadPoolExecutor.h \
 	executors/Codel.h \
+	executors/DrivableExecutor.h \
 	executors/FiberIOExecutor.h \
 	executors/FutureExecutor.h \
 	executors/GlobalExecutor.h \
@@ -205,7 +206,6 @@ nobase_follyinclude_HEADERS = \
 	Format-inl.h \
 	functional/Invoke.h \
 	futures/Barrier.h \
-	futures/DrivableExecutor.h \
 	futures/Future-pre.h \
 	futures/helpers.h \
 	futures/Future.h \
diff --git a/folly/futures/DrivableExecutor.h b/folly/executors/DrivableExecutor.h
similarity index 100%
rename from folly/futures/DrivableExecutor.h
rename to folly/executors/DrivableExecutor.h
diff --git a/folly/executors/NotificationQueueExecutor.h b/folly/executors/NotificationQueueExecutor.h
index 3738be24..5e19fc41 100644
--- a/folly/executors/NotificationQueueExecutor.h
+++ b/folly/executors/NotificationQueueExecutor.h
@@ -17,7 +17,7 @@
 
 #include <folly/ExceptionString.h>
 #include <folly/Function.h>
-#include <folly/futures/DrivableExecutor.h>
+#include <folly/executors/DrivableExecutor.h>
 #include <folly/io/async/NotificationQueue.h>
 
 namespace folly {
diff --git a/folly/futures/Future.h b/folly/futures/Future.h
index f5c3190f..0c4092aa 100644
--- a/folly/futures/Future.h
+++ b/folly/futures/Future.h
@@ -27,7 +27,7 @@
 #include <folly/Portability.h>
 #include <folly/Try.h>
 #include <folly/Utility.h>
-#include <folly/futures/DrivableExecutor.h>
+#include <folly/executors/DrivableExecutor.h>
 #include <folly/futures/FutureException.h>
 #include <folly/futures/Promise.h>
 #include <folly/futures/detail/Types.h>
diff --git a/folly/futures/ManualExecutor.h b/folly/futures/ManualExecutor.h
index 689111eb..373e4ac7 100644
--- a/folly/futures/ManualExecutor.h
+++ b/folly/futures/ManualExecutor.h
@@ -22,7 +22,7 @@
 #include <queue>
 
 #include <folly/LifoSem.h>
-#include <folly/futures/DrivableExecutor.h>
+#include <folly/executors/DrivableExecutor.h>
 #include <folly/futures/ScheduledExecutor.h>
 
 namespace folly {
diff --git a/folly/futures/README.md b/folly/futures/README.md
index d0e2693d..e4bce679 100644
--- a/folly/futures/README.md
+++ b/folly/futures/README.md
@@ -902,7 +902,7 @@ Although inspired by the C++11 std::future interface, it is not a drop-in replac
 
 <h3 id="getvia-and-waitvia">getVia() and waitVia() <a href="#getvia-and-waitvia" class="headerLink">#</a></h3>
 
-<p><tt>T Future&lt;T&gt;::getVia(DrivableExecutor*)</tt> and <tt>Future&lt;T&gt; Future&lt;T&gt;::waitVia(DrivableExecutor*)</tt> have the same semantics as <tt>get()</tt> and <tt>wait()</tt> except that they drive some Executor until the Future is complete. <a href="https://github.com/facebook/folly/blob/master/folly/futures/DrivableExecutor.h" target="_blank"><tt>DrivableExecutor</tt></a> is a simple subinterface of <tt>Executor</tt> that requires the presence of a method <tt>drive()</tt> which can somehow make progress on the Executor&#039;s work. Two commonly helpful implementations are <a href="https://github.com/facebook/folly/blob/master/folly/io/async/EventBase.h" target="_blank"><tt>EventBase</tt></a> (where <tt>drive()</tt> loops on the EventBase) and <a href="https://github.com/facebook/folly/blob/master/folly/futures/ManualExecutor.h" target="_blank"><tt>ManualExecutor</tt></a>. These are simple but useful sugar for the following common pattern:</p>
+<p><tt>T Future&lt;T&gt;::getVia(DrivableExecutor*)</tt> and <tt>Future&lt;T&gt; Future&lt;T&gt;::waitVia(DrivableExecutor*)</tt> have the same semantics as <tt>get()</tt> and <tt>wait()</tt> except that they drive some Executor until the Future is complete. <a href="https://github.com/facebook/folly/blob/master/folly/executors/DrivableExecutor.h" target="_blank"><tt>DrivableExecutor</tt></a> is a simple subinterface of <tt>Executor</tt> that requires the presence of a method <tt>drive()</tt> which can somehow make progress on the Executor&#039;s work. Two commonly helpful implementations are <a href="https://github.com/facebook/folly/blob/master/folly/io/async/EventBase.h" target="_blank"><tt>EventBase</tt></a> (where <tt>drive()</tt> loops on the EventBase) and <a href="https://github.com/facebook/folly/blob/master/folly/futures/ManualExecutor.h" target="_blank"><tt>ManualExecutor</tt></a>. These are simple but useful sugar for the following common pattern:</p>
 
 <p>Given this:</p>
 
diff --git a/folly/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp
index 198c4f93..1a530d37 100644
--- a/folly/futures/test/ViaTest.cpp
+++ b/folly/futures/test/ViaTest.cpp
@@ -18,7 +18,7 @@
 
 #include <folly/Baton.h>
 #include <folly/MPMCQueue.h>
-#include <folly/futures/DrivableExecutor.h>
+#include <folly/executors/DrivableExecutor.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
diff --git a/folly/io/async/EventBase.h b/folly/io/async/EventBase.h
index ee7ceca7..670d6af6 100644
--- a/folly/io/async/EventBase.h
+++ b/folly/io/async/EventBase.h
@@ -40,15 +40,14 @@
 #include <folly/Function.h>
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
+#include <folly/executors/DrivableExecutor.h>
 #include <folly/experimental/ExecutionObserver.h>
-#include <folly/futures/DrivableExecutor.h>
 #include <folly/io/async/AsyncTimeout.h>
 #include <folly/io/async/HHWheelTimer.h>
 #include <folly/io/async/Request.h>
 #include <folly/io/async/TimeoutManager.h>
 #include <folly/portability/Event.h>
 
-
 namespace folly {
 
 using Cob = Func; // defined in folly/Executor.h
-- 
2.34.1