From fe34da59aecff8fb1bfca13361d02026cfa3b17e Mon Sep 17 00:00:00 2001 From: James Sedgwick Date: Wed, 18 Oct 2017 16:32:35 -0700 Subject: [PATCH] move futures/QueuedImmediateExecutor to executors/QueuedImmediateExecutor Summary: as above Reviewed By: yfeldblum Differential Revision: D6076779 fbshipit-source-id: 4c223ab9fce3be8544f6f807781c3d0a99b61dad --- folly/Makefile.am | 4 ++-- folly/{futures => executors}/QueuedImmediateExecutor.cpp | 2 +- folly/{futures => executors}/QueuedImmediateExecutor.h | 0 folly/futures/test/ExecutorTest.cpp | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) rename folly/{futures => executors}/QueuedImmediateExecutor.cpp (94%) rename folly/{futures => executors}/QueuedImmediateExecutor.h (100%) diff --git a/folly/Makefile.am b/folly/Makefile.am index b9adb7f6..ce29ac05 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -106,6 +106,7 @@ nobase_follyinclude_HEADERS = \ executors/ThreadPoolExecutor.h \ executors/ThreadedExecutor.h \ executors/UnboundedBlockingQueue.h \ + executors/QueuedImmediateExecutor.h \ Demangle.h \ DiscriminatedPtr.h \ DynamicConverter.h \ @@ -218,7 +219,6 @@ nobase_follyinclude_HEADERS = \ futures/ManualExecutor.h \ futures/Promise-inl.h \ futures/Promise.h \ - futures/QueuedImmediateExecutor.h \ futures/SharedPromise.h \ futures/SharedPromise-inl.h \ futures/ThreadWheelTimekeeper.h \ @@ -505,7 +505,6 @@ libfolly_la_SOURCES = \ futures/Future.cpp \ futures/FutureException.cpp \ futures/ManualExecutor.cpp \ - futures/QueuedImmediateExecutor.cpp \ futures/ThreadWheelTimekeeper.cpp \ futures/test/TestExecutor.cpp \ executors/CPUThreadPoolExecutor.cpp \ @@ -515,6 +514,7 @@ libfolly_la_SOURCES = \ executors/SerialExecutor.cpp \ executors/ThreadPoolExecutor.cpp \ executors/ThreadedExecutor.cpp \ + executors/QueuedImmediateExecutor.cpp \ experimental/hazptr/hazptr.cpp \ experimental/hazptr/memory_resource.cpp \ GroupVarint.cpp \ diff --git a/folly/futures/QueuedImmediateExecutor.cpp b/folly/executors/QueuedImmediateExecutor.cpp similarity index 94% rename from folly/futures/QueuedImmediateExecutor.cpp rename to folly/executors/QueuedImmediateExecutor.cpp index 204d424b..1dbdb5c1 100644 --- a/folly/futures/QueuedImmediateExecutor.cpp +++ b/folly/executors/QueuedImmediateExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/futures/QueuedImmediateExecutor.h b/folly/executors/QueuedImmediateExecutor.h similarity index 100% rename from folly/futures/QueuedImmediateExecutor.h rename to folly/executors/QueuedImmediateExecutor.h diff --git a/folly/futures/test/ExecutorTest.cpp b/folly/futures/test/ExecutorTest.cpp index 88679ecb..2c201d0a 100644 --- a/folly/futures/test/ExecutorTest.cpp +++ b/folly/futures/test/ExecutorTest.cpp @@ -15,12 +15,15 @@ */ #include +#include #include #include #include -#include #include +// TODO(jsedgwick) move this test to executors/test/ once the tested executors +// have all moved + using namespace folly; TEST(ManualExecutor, runIsStable) { -- 2.34.1