From 1719bfce91a3cca41abc566049eb4f4b8b2a565a Mon Sep 17 00:00:00 2001 From: James Sedgwick Date: Sat, 21 Oct 2017 15:28:58 -0700 Subject: [PATCH] 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 --- folly/Makefile.am | 11 +++++------ folly/executors/GlobalExecutor.cpp | 2 +- .../GlobalThreadPoolList.cpp | 2 +- .../{concurrency => executors}/GlobalThreadPoolList.h | 0 folly/{futures => executors}/InlineExecutor.cpp | 2 +- folly/{futures => executors}/InlineExecutor.h | 0 folly/{futures => executors}/ManualExecutor.cpp | 2 +- folly/{futures => executors}/ManualExecutor.h | 0 folly/executors/ThreadPoolExecutor.cpp | 2 +- folly/executors/ThreadPoolExecutor.h | 2 +- folly/executors/test/AsyncTest.cpp | 2 +- folly/executors/test/SerialExecutorTest.cpp | 2 +- folly/futures/Future-inl.h | 2 +- folly/futures/test/Benchmark.cpp | 2 +- folly/futures/test/ExecutorTest.cpp | 4 ++-- folly/futures/test/SelfDestructTest.cpp | 2 +- folly/futures/test/ViaTest.cpp | 4 ++-- folly/futures/test/WindowTest.cpp | 2 +- 18 files changed, 21 insertions(+), 22 deletions(-) rename folly/{concurrency => executors}/GlobalThreadPoolList.cpp (99%) rename folly/{concurrency => executors}/GlobalThreadPoolList.h (100%) rename folly/{futures => executors}/InlineExecutor.cpp (94%) rename folly/{futures => executors}/InlineExecutor.h (100%) rename folly/{futures => executors}/ManualExecutor.cpp (97%) rename folly/{futures => executors}/ManualExecutor.h (100%) diff --git a/folly/Makefile.am b/folly/Makefile.am index cbc950b2..eac08817 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -59,7 +59,6 @@ nobase_follyinclude_HEADERS = \ concurrency/CacheLocality.h \ concurrency/ConcurrentHashMap.h \ concurrency/CoreCachedSharedPtr.h \ - concurrency/GlobalThreadPoolList.h \ concurrency/detail/ConcurrentHashMap-detail.h \ ConstexprMath.h \ detail/AtomicHashUtils.h \ @@ -92,6 +91,8 @@ nobase_follyinclude_HEADERS = \ executors/FiberIOExecutor.h \ executors/FutureExecutor.h \ executors/GlobalExecutor.h \ + executors/GlobalThreadPoolList.h \ + executors/InlineExecutor.h \ executors/IOExecutor.h \ executors/IOObjectCache.h \ executors/IOThreadPoolExecutor.h \ @@ -216,8 +217,6 @@ nobase_follyinclude_HEADERS = \ futures/Future-inl.h \ futures/FutureException.h \ futures/FutureSplitter.h \ - futures/InlineExecutor.h \ - futures/ManualExecutor.h \ futures/Promise-inl.h \ futures/Promise.h \ futures/SharedPromise.h \ @@ -491,7 +490,6 @@ libfolly_la_SOURCES = \ compression/Compression.cpp \ compression/Zlib.cpp \ concurrency/CacheLocality.cpp \ - concurrency/GlobalThreadPoolList.cpp \ detail/Futex.cpp \ detail/IPAddress.cpp \ detail/StaticSingletonManager.cpp \ @@ -505,14 +503,15 @@ libfolly_la_SOURCES = \ futures/Barrier.cpp \ futures/Future.cpp \ futures/FutureException.cpp \ - futures/InlineExecutor.cpp \ - futures/ManualExecutor.cpp \ futures/ThreadWheelTimekeeper.cpp \ futures/test/TestExecutor.cpp \ executors/CPUThreadPoolExecutor.cpp \ executors/Codel.cpp \ executors/GlobalExecutor.cpp \ + executors/GlobalThreadPoolList.cpp \ executors/IOThreadPoolExecutor.cpp \ + executors/InlineExecutor.cpp \ + executors/ManualExecutor.cpp \ executors/SerialExecutor.cpp \ executors/ThreadPoolExecutor.cpp \ executors/ThreadedExecutor.cpp \ diff --git a/folly/executors/GlobalExecutor.cpp b/folly/executors/GlobalExecutor.cpp index d2de51d7..ef853751 100644 --- a/folly/executors/GlobalExecutor.cpp +++ b/folly/executors/GlobalExecutor.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include using namespace folly; diff --git a/folly/concurrency/GlobalThreadPoolList.cpp b/folly/executors/GlobalThreadPoolList.cpp similarity index 99% rename from folly/concurrency/GlobalThreadPoolList.cpp rename to folly/executors/GlobalThreadPoolList.cpp index 680193d2..a9e5e532 100644 --- a/folly/concurrency/GlobalThreadPoolList.cpp +++ b/folly/executors/GlobalThreadPoolList.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/concurrency/GlobalThreadPoolList.h b/folly/executors/GlobalThreadPoolList.h similarity index 100% rename from folly/concurrency/GlobalThreadPoolList.h rename to folly/executors/GlobalThreadPoolList.h diff --git a/folly/futures/InlineExecutor.cpp b/folly/executors/InlineExecutor.cpp similarity index 94% rename from folly/futures/InlineExecutor.cpp rename to folly/executors/InlineExecutor.cpp index 848e7f26..d51ae7bb 100644 --- a/folly/futures/InlineExecutor.cpp +++ b/folly/executors/InlineExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include diff --git a/folly/futures/InlineExecutor.h b/folly/executors/InlineExecutor.h similarity index 100% rename from folly/futures/InlineExecutor.h rename to folly/executors/InlineExecutor.h diff --git a/folly/futures/ManualExecutor.cpp b/folly/executors/ManualExecutor.cpp similarity index 97% rename from folly/futures/ManualExecutor.cpp rename to folly/executors/ManualExecutor.cpp index 50941d02..51ff9c8a 100644 --- a/folly/futures/ManualExecutor.cpp +++ b/folly/executors/ManualExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/futures/ManualExecutor.h b/folly/executors/ManualExecutor.h similarity index 100% rename from folly/futures/ManualExecutor.h rename to folly/executors/ManualExecutor.h diff --git a/folly/executors/ThreadPoolExecutor.cpp b/folly/executors/ThreadPoolExecutor.cpp index 227f2b1d..84394db0 100644 --- a/folly/executors/ThreadPoolExecutor.cpp +++ b/folly/executors/ThreadPoolExecutor.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace folly { diff --git a/folly/executors/ThreadPoolExecutor.h b/folly/executors/ThreadPoolExecutor.h index 09ff14fd..a92726ef 100644 --- a/folly/executors/ThreadPoolExecutor.h +++ b/folly/executors/ThreadPoolExecutor.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/folly/executors/test/AsyncTest.cpp b/folly/executors/test/AsyncTest.cpp index 0622a8a6..4a7f0cf0 100644 --- a/folly/executors/test/AsyncTest.cpp +++ b/folly/executors/test/AsyncTest.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include using namespace folly; diff --git a/folly/executors/test/SerialExecutorTest.cpp b/folly/executors/test/SerialExecutorTest.cpp index 285fd747..ae487591 100644 --- a/folly/executors/test/SerialExecutorTest.cpp +++ b/folly/executors/test/SerialExecutorTest.cpp @@ -18,8 +18,8 @@ #include #include +#include #include -#include #include using namespace std::chrono; diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h index c7ddeb0a..b903a644 100644 --- a/folly/futures/Future-inl.h +++ b/folly/futures/Future-inl.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/folly/futures/test/Benchmark.cpp b/folly/futures/test/Benchmark.cpp index 56f4f712..a9c743de 100644 --- a/folly/futures/test/Benchmark.cpp +++ b/folly/futures/test/Benchmark.cpp @@ -16,8 +16,8 @@ #include #include +#include #include -#include #include #include #include diff --git a/folly/futures/test/ExecutorTest.cpp b/folly/futures/test/ExecutorTest.cpp index 2c201d0a..1755a2fc 100644 --- a/folly/futures/test/ExecutorTest.cpp +++ b/folly/futures/test/ExecutorTest.cpp @@ -15,10 +15,10 @@ */ #include +#include +#include #include #include -#include -#include #include // TODO(jsedgwick) move this test to executors/test/ once the tested executors diff --git a/folly/futures/test/SelfDestructTest.cpp b/folly/futures/test/SelfDestructTest.cpp index 41b56bf5..fb2bc3f2 100644 --- a/folly/futures/test/SelfDestructTest.cpp +++ b/folly/futures/test/SelfDestructTest.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ +#include #include -#include #include using namespace folly; diff --git a/folly/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp index 79e6c9bf..fb2008a8 100644 --- a/folly/futures/test/ViaTest.cpp +++ b/folly/futures/test/ViaTest.cpp @@ -19,9 +19,9 @@ #include #include #include +#include +#include #include -#include -#include #include using namespace folly; diff --git a/folly/futures/test/WindowTest.cpp b/folly/futures/test/WindowTest.cpp index 098fc7a8..90158d47 100644 --- a/folly/futures/test/WindowTest.cpp +++ b/folly/futures/test/WindowTest.cpp @@ -17,8 +17,8 @@ #include #include +#include #include -#include #include #include -- 2.34.1