Commit 1719bfce authored by James Sedgwick's avatar James Sedgwick Committed by Facebook Github Bot

move InlineExecutor, ManualExecutor, and GlobalThreadPoolList to

Summary:
That's everything that's going in executors/ except for Executor.h
itself, which is included in hphp so will have to wait

Reviewed By: mzlee

Differential Revision: D6100274

fbshipit-source-id: 6be37892b1ad7f46828acfa6b2951e51b157a86a
parent 87a2402c
...@@ -59,7 +59,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -59,7 +59,6 @@ nobase_follyinclude_HEADERS = \
concurrency/CacheLocality.h \ concurrency/CacheLocality.h \
concurrency/ConcurrentHashMap.h \ concurrency/ConcurrentHashMap.h \
concurrency/CoreCachedSharedPtr.h \ concurrency/CoreCachedSharedPtr.h \
concurrency/GlobalThreadPoolList.h \
concurrency/detail/ConcurrentHashMap-detail.h \ concurrency/detail/ConcurrentHashMap-detail.h \
ConstexprMath.h \ ConstexprMath.h \
detail/AtomicHashUtils.h \ detail/AtomicHashUtils.h \
...@@ -92,6 +91,8 @@ nobase_follyinclude_HEADERS = \ ...@@ -92,6 +91,8 @@ nobase_follyinclude_HEADERS = \
executors/FiberIOExecutor.h \ executors/FiberIOExecutor.h \
executors/FutureExecutor.h \ executors/FutureExecutor.h \
executors/GlobalExecutor.h \ executors/GlobalExecutor.h \
executors/GlobalThreadPoolList.h \
executors/InlineExecutor.h \
executors/IOExecutor.h \ executors/IOExecutor.h \
executors/IOObjectCache.h \ executors/IOObjectCache.h \
executors/IOThreadPoolExecutor.h \ executors/IOThreadPoolExecutor.h \
...@@ -216,8 +217,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -216,8 +217,6 @@ nobase_follyinclude_HEADERS = \
futures/Future-inl.h \ futures/Future-inl.h \
futures/FutureException.h \ futures/FutureException.h \
futures/FutureSplitter.h \ futures/FutureSplitter.h \
futures/InlineExecutor.h \
futures/ManualExecutor.h \
futures/Promise-inl.h \ futures/Promise-inl.h \
futures/Promise.h \ futures/Promise.h \
futures/SharedPromise.h \ futures/SharedPromise.h \
...@@ -491,7 +490,6 @@ libfolly_la_SOURCES = \ ...@@ -491,7 +490,6 @@ libfolly_la_SOURCES = \
compression/Compression.cpp \ compression/Compression.cpp \
compression/Zlib.cpp \ compression/Zlib.cpp \
concurrency/CacheLocality.cpp \ concurrency/CacheLocality.cpp \
concurrency/GlobalThreadPoolList.cpp \
detail/Futex.cpp \ detail/Futex.cpp \
detail/IPAddress.cpp \ detail/IPAddress.cpp \
detail/StaticSingletonManager.cpp \ detail/StaticSingletonManager.cpp \
...@@ -505,14 +503,15 @@ libfolly_la_SOURCES = \ ...@@ -505,14 +503,15 @@ libfolly_la_SOURCES = \
futures/Barrier.cpp \ futures/Barrier.cpp \
futures/Future.cpp \ futures/Future.cpp \
futures/FutureException.cpp \ futures/FutureException.cpp \
futures/InlineExecutor.cpp \
futures/ManualExecutor.cpp \
futures/ThreadWheelTimekeeper.cpp \ futures/ThreadWheelTimekeeper.cpp \
futures/test/TestExecutor.cpp \ futures/test/TestExecutor.cpp \
executors/CPUThreadPoolExecutor.cpp \ executors/CPUThreadPoolExecutor.cpp \
executors/Codel.cpp \ executors/Codel.cpp \
executors/GlobalExecutor.cpp \ executors/GlobalExecutor.cpp \
executors/GlobalThreadPoolList.cpp \
executors/IOThreadPoolExecutor.cpp \ executors/IOThreadPoolExecutor.cpp \
executors/InlineExecutor.cpp \
executors/ManualExecutor.cpp \
executors/SerialExecutor.cpp \ executors/SerialExecutor.cpp \
executors/ThreadPoolExecutor.cpp \ executors/ThreadPoolExecutor.cpp \
executors/ThreadedExecutor.cpp \ executors/ThreadedExecutor.cpp \
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <folly/Singleton.h> #include <folly/Singleton.h>
#include <folly/executors/IOExecutor.h> #include <folly/executors/IOExecutor.h>
#include <folly/executors/IOThreadPoolExecutor.h> #include <folly/executors/IOThreadPoolExecutor.h>
#include <folly/futures/InlineExecutor.h> #include <folly/executors/InlineExecutor.h>
using namespace folly; using namespace folly;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/concurrency/GlobalThreadPoolList.h> #include <folly/executors/GlobalThreadPoolList.h>
#include <memory> #include <memory>
#include <string> #include <string>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/futures/InlineExecutor.h> #include <folly/executors/InlineExecutor.h>
#include <folly/Indestructible.h> #include <folly/Indestructible.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/futures/ManualExecutor.h> #include <folly/executors/ManualExecutor.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <folly/executors/ThreadPoolExecutor.h> #include <folly/executors/ThreadPoolExecutor.h>
#include <folly/concurrency/GlobalThreadPoolList.h> #include <folly/executors/GlobalThreadPoolList.h>
namespace folly { namespace folly {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <folly/Executor.h> #include <folly/Executor.h>
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/RWSpinLock.h> #include <folly/RWSpinLock.h>
#include <folly/concurrency/GlobalThreadPoolList.h> #include <folly/executors/GlobalThreadPoolList.h>
#include <folly/executors/task_queue/LifoSemMPMCQueue.h> #include <folly/executors/task_queue/LifoSemMPMCQueue.h>
#include <folly/executors/thread_factory/NamedThreadFactory.h> #include <folly/executors/thread_factory/NamedThreadFactory.h>
#include <folly/io/async/Request.h> #include <folly/io/async/Request.h>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#include <folly/executors/Async.h> #include <folly/executors/Async.h>
#include <folly/futures/ManualExecutor.h> #include <folly/executors/ManualExecutor.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
using namespace folly; using namespace folly;
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/executors/CPUThreadPoolExecutor.h> #include <folly/executors/CPUThreadPoolExecutor.h>
#include <folly/executors/InlineExecutor.h>
#include <folly/executors/SerialExecutor.h> #include <folly/executors/SerialExecutor.h>
#include <folly/futures/InlineExecutor.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
using namespace std::chrono; using namespace std::chrono;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/Optional.h> #include <folly/Optional.h>
#include <folly/futures/InlineExecutor.h> #include <folly/executors/InlineExecutor.h>
#include <folly/futures/Timekeeper.h> #include <folly/futures/Timekeeper.h>
#include <folly/futures/detail/Core.h> #include <folly/futures/detail/Core.h>
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <folly/Benchmark.h> #include <folly/Benchmark.h>
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/executors/InlineExecutor.h>
#include <folly/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/futures/InlineExecutor.h>
#include <folly/futures/Promise.h> #include <folly/futures/Promise.h>
#include <folly/portability/GFlags.h> #include <folly/portability/GFlags.h>
#include <folly/portability/Semaphore.h> #include <folly/portability/Semaphore.h>
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
*/ */
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/executors/InlineExecutor.h>
#include <folly/executors/ManualExecutor.h>
#include <folly/executors/QueuedImmediateExecutor.h> #include <folly/executors/QueuedImmediateExecutor.h>
#include <folly/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/futures/InlineExecutor.h>
#include <folly/futures/ManualExecutor.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
// TODO(jsedgwick) move this test to executors/test/ once the tested executors // TODO(jsedgwick) move this test to executors/test/ once the tested executors
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/executors/InlineExecutor.h>
#include <folly/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/futures/InlineExecutor.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
using namespace folly; using namespace folly;
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/MPMCQueue.h> #include <folly/MPMCQueue.h>
#include <folly/executors/DrivableExecutor.h> #include <folly/executors/DrivableExecutor.h>
#include <folly/executors/InlineExecutor.h>
#include <folly/executors/ManualExecutor.h>
#include <folly/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/futures/InlineExecutor.h>
#include <folly/futures/ManualExecutor.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
using namespace folly; using namespace folly;
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <boost/thread/barrier.hpp> #include <boost/thread/barrier.hpp>
#include <folly/Conv.h> #include <folly/Conv.h>
#include <folly/executors/ManualExecutor.h>
#include <folly/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/futures/ManualExecutor.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
#include <vector> #include <vector>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment