Commit bc374dcb authored by James Sedgwick's avatar James Sedgwick Committed by Viswanath Sivakumar

move wangle/futures to futures

Summary:
First step of moving futures out of wangle into folly

Namespace change will be another diff

This was just a straight codemod of "wangle/futures" to "futures"

Test Plan: wait for contbuild

Reviewed By: davejwatson@fb.com

Subscribers: trunkagent, fbcode-common-diffs@, chaoyc, search-fbcode-diffs@, lars, ruibalp, hero-diffs@, zeus-diffs@, vikas, mcduff, hitesh, cold-storage-diffs@, unicorn-diffs@, ldbrandy, targeting-diff-backend@, netego-diffs@, fugalh, adamsyta, atlas2-eng@, alandau, apollo-diffs@, bmatheny, adityab, everstore-dev@, zhuohuang, sweeney, mwa, jgehring, prometheus-diffs@, smarlow, akr, bnitka, jcoens, zhguo, jying, darshan, apodsiadlo, alikhtarov, fuegen, dzhulgakov, alihussains, jeremyfein, mshneer, folly-diffs@, wch, lins, tingy, maxwellsayles, hannesr

FB internal diff: D1772041

Tasks: 5960242

Signature: t1:1772041:1420739169:36126b1264c5d1747d241921d02b13e306c73fe1
parent 0a9f6eef
...@@ -84,6 +84,24 @@ nobase_follyinclude_HEADERS = \ ...@@ -84,6 +84,24 @@ nobase_follyinclude_HEADERS = \
FormatArg.h \ FormatArg.h \
Format.h \ Format.h \
Format-inl.h \ Format-inl.h \
futures/Deprecated.h \
futures/Future-inl.h \
futures/Future.h \
futures/InlineExecutor.h \
futures/ManualExecutor.h \
futures/OpaqueCallbackShunt.h \
futures/Promise-inl.h \
futures/Promise.h \
futures/QueuedImmediateExecutor.h \
futures/ScheduledExecutor.h \
futures/Timekeeper.h \
futures/Try-inl.h \
futures/Try.h \
futures/WangleException.h \
futures/detail/Core.h \
futures/detail/FSM.h \
futures/detail/ThreadWheelTimekeeper.h \
futures/detail/Types.h \
gen/Base.h \ gen/Base.h \
gen/Base-inl.h \ gen/Base-inl.h \
gen/Combine.h \ gen/Combine.h \
...@@ -221,24 +239,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -221,24 +239,6 @@ nobase_follyinclude_HEADERS = \
wangle/concurrent/NamedThreadFactory.h \ wangle/concurrent/NamedThreadFactory.h \
wangle/concurrent/ThreadFactory.h \ wangle/concurrent/ThreadFactory.h \
wangle/concurrent/ThreadPoolExecutor.h \ wangle/concurrent/ThreadPoolExecutor.h \
wangle/futures/Deprecated.h \
wangle/futures/Future-inl.h \
wangle/futures/Future.h \
wangle/futures/InlineExecutor.h \
wangle/futures/ManualExecutor.h \
wangle/futures/OpaqueCallbackShunt.h \
wangle/futures/Promise-inl.h \
wangle/futures/Promise.h \
wangle/futures/QueuedImmediateExecutor.h \
wangle/futures/ScheduledExecutor.h \
wangle/futures/Timekeeper.h \
wangle/futures/Try-inl.h \
wangle/futures/Try.h \
wangle/futures/WangleException.h \
wangle/futures/detail/Core.h \
wangle/futures/detail/FSM.h \
wangle/futures/detail/ThreadWheelTimekeeper.h \
wangle/futures/detail/Types.h \
wangle/rx/Observable.h \ wangle/rx/Observable.h \
wangle/rx/Observer.h \ wangle/rx/Observer.h \
wangle/rx/Subject.h \ wangle/rx/Subject.h \
...@@ -287,6 +287,11 @@ libfolly_la_SOURCES = \ ...@@ -287,6 +287,11 @@ libfolly_la_SOURCES = \
File.cpp \ File.cpp \
FileUtil.cpp \ FileUtil.cpp \
FingerprintTables.cpp \ FingerprintTables.cpp \
futures/detail/ThreadWheelTimekeeper.cpp \
futures/Future.cpp \
futures/InlineExecutor.cpp \
futures/ManualExecutor.cpp \
futures/QueuedImmediateExecutor.cpp \
detail/Futex.cpp \ detail/Futex.cpp \
GroupVarint.cpp \ GroupVarint.cpp \
GroupVarintTables.cpp \ GroupVarintTables.cpp \
...@@ -342,11 +347,6 @@ libfolly_la_SOURCES = \ ...@@ -342,11 +347,6 @@ libfolly_la_SOURCES = \
wangle/concurrent/IOThreadPoolExecutor.cpp \ wangle/concurrent/IOThreadPoolExecutor.cpp \
wangle/concurrent/GlobalExecutor.cpp \ wangle/concurrent/GlobalExecutor.cpp \
wangle/concurrent/ThreadPoolExecutor.cpp \ wangle/concurrent/ThreadPoolExecutor.cpp \
wangle/futures/detail/ThreadWheelTimekeeper.cpp \
wangle/futures/Future.cpp \
wangle/futures/InlineExecutor.cpp \
wangle/futures/ManualExecutor.cpp \
wangle/futures/QueuedImmediateExecutor.cpp \
wangle/ssl/PasswordInFile.cpp \ wangle/ssl/PasswordInFile.cpp \
wangle/ssl/SSLContextManager.cpp \ wangle/ssl/SSLContextManager.cpp \
wangle/ssl/SSLSessionCacheManager.cpp \ wangle/ssl/SSLSessionCacheManager.cpp \
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include <thread> #include <thread>
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/wangle/futures/detail/Core.h> #include <folly/futures/detail/Core.h>
#include <folly/wangle/futures/Timekeeper.h> #include <folly/futures/Timekeeper.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/futures/detail/ThreadWheelTimekeeper.h> #include <folly/futures/detail/ThreadWheelTimekeeper.h>
#include <folly/Likely.h> #include <folly/Likely.h>
namespace folly { namespace wangle { namespace futures { namespace folly { namespace wangle { namespace futures {
......
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
#include <vector> #include <vector>
#include <folly/MoveWrapper.h> #include <folly/MoveWrapper.h>
#include <folly/wangle/futures/Deprecated.h> #include <folly/futures/Deprecated.h>
#include <folly/wangle/futures/Promise.h> #include <folly/futures/Promise.h>
#include <folly/wangle/futures/Try.h> #include <folly/futures/Try.h>
#include <folly/wangle/futures/WangleException.h> #include <folly/futures/WangleException.h>
#include <folly/wangle/futures/detail/Types.h> #include <folly/futures/detail/Types.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
...@@ -628,4 +628,4 @@ Future<T> waitWithSemaphore(Future<T>&& f, Dur timeout); ...@@ -628,4 +628,4 @@ Future<T> waitWithSemaphore(Future<T>&& f, Dur timeout);
}} // folly::wangle }} // folly::wangle
#include <folly/wangle/futures/Future-inl.h> #include <folly/futures/Future-inl.h>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/wangle/futures/ManualExecutor.h> #include <folly/futures/ManualExecutor.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#pragma once #pragma once
#include <folly/wangle/futures/ScheduledExecutor.h> #include <folly/futures/ScheduledExecutor.h>
#include <semaphore.h> #include <semaphore.h>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <folly/wangle/futures/Promise.h> #include <folly/futures/Promise.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <atomic> #include <atomic>
#include <thread> #include <thread>
#include <folly/wangle/futures/WangleException.h> #include <folly/futures/WangleException.h>
#include <folly/wangle/futures/detail/Core.h> #include <folly/futures/detail/Core.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#pragma once #pragma once
#include <folly/wangle/futures/Deprecated.h> #include <folly/futures/Deprecated.h>
#include <folly/wangle/futures/Try.h> #include <folly/futures/Try.h>
#include <functional> #include <functional>
namespace folly { namespace wangle { namespace folly { namespace wangle {
...@@ -104,5 +104,5 @@ private: ...@@ -104,5 +104,5 @@ private:
}} }}
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/futures/Promise-inl.h> #include <folly/futures/Promise-inl.h>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/wangle/futures/QueuedImmediateExecutor.h> #include <folly/futures/QueuedImmediateExecutor.h>
#include <folly/ThreadLocal.h> #include <folly/ThreadLocal.h>
#include <queue> #include <queue>
......
...@@ -18,7 +18,7 @@ The primary semantic differences are that Wangle Futures and Promises are not th ...@@ -18,7 +18,7 @@ The primary semantic differences are that Wangle Futures and Promises are not th
## Brief Synopsis ## Brief Synopsis
```C++ ```C++
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
using namespace folly::wangle; using namespace folly::wangle;
using namespace std; using namespace std;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <folly/wangle/futures/detail/Types.h> #include <folly/futures/detail/Types.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
...@@ -71,7 +71,7 @@ class Timekeeper { ...@@ -71,7 +71,7 @@ class Timekeeper {
}} }}
// now get those definitions // now get those definitions
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
// finally we can use Future // finally we can use Future
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <stdexcept> #include <stdexcept>
#include <folly/wangle/futures/WangleException.h> #include <folly/futures/WangleException.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <folly/ExceptionWrapper.h> #include <folly/ExceptionWrapper.h>
#include <folly/Likely.h> #include <folly/Likely.h>
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/wangle/futures/Deprecated.h> #include <folly/futures/Deprecated.h>
#include <folly/wangle/futures/WangleException.h> #include <folly/futures/WangleException.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
...@@ -349,4 +349,4 @@ makeTryFunction(F&& f); ...@@ -349,4 +349,4 @@ makeTryFunction(F&& f);
}} }}
#include <folly/wangle/futures/Try-inl.h> #include <folly/futures/Try-inl.h>
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
#include <folly/Optional.h> #include <folly/Optional.h>
#include <folly/SmallLocks.h> #include <folly/SmallLocks.h>
#include <folly/wangle/futures/Try.h> #include <folly/futures/Try.h>
#include <folly/wangle/futures/Promise.h> #include <folly/futures/Promise.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/Executor.h> #include <folly/Executor.h>
#include <folly/wangle/futures/detail/FSM.h> #include <folly/futures/detail/FSM.h>
#include <folly/io/async/Request.h> #include <folly/io/async/Request.h>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "ThreadWheelTimekeeper.h" #include "ThreadWheelTimekeeper.h"
#include <folly/experimental/Singleton.h> #include <folly/experimental/Singleton.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <future> #include <future>
namespace folly { namespace wangle { namespace detail { namespace folly { namespace wangle { namespace detail {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#pragma once #pragma once
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/futures/Timekeeper.h> #include <folly/futures/Timekeeper.h>
#include <folly/io/async/EventBase.h> #include <folly/io/async/EventBase.h>
#include <folly/io/async/HHWheelTimer.h> #include <folly/io/async/HHWheelTimer.h>
#include <thread> #include <thread>
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/Benchmark.h> #include <folly/Benchmark.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/futures/Promise.h> #include <folly/futures/Promise.h>
#include <semaphore.h> #include <semaphore.h>
#include <vector> #include <vector>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// amazing what things can go wrong if you include things in an unexpected // amazing what things can go wrong if you include things in an unexpected
// order. // order.
#include <folly/wangle/futures/Try.h> #include <folly/futures/Try.h>
#include <folly/wangle/futures/Promise.h> #include <folly/futures/Promise.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
int main() { return 0; } int main() { return 0; }
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
*/ */
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/wangle/futures/InlineExecutor.h> #include <folly/futures/InlineExecutor.h>
#include <folly/wangle/futures/ManualExecutor.h> #include <folly/futures/ManualExecutor.h>
#include <folly/wangle/futures/QueuedImmediateExecutor.h> #include <folly/futures/QueuedImmediateExecutor.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/Baton.h> #include <folly/Baton.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/wangle/futures/detail/FSM.h> #include <folly/futures/detail/FSM.h>
using namespace folly::wangle::detail; using namespace folly::wangle::detail;
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include <unistd.h> #include <unistd.h>
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/Executor.h> #include <folly/Executor.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/futures/ManualExecutor.h> #include <folly/futures/ManualExecutor.h>
#include <folly/MPMCQueue.h> #include <folly/MPMCQueue.h>
#include <folly/io/async/Request.h> #include <folly/io/async/Request.h>
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/futures/Promise.h> #include <folly/futures/Promise.h>
using namespace folly::wangle; using namespace folly::wangle;
using folly::exception_wrapper; using folly::exception_wrapper;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// TODO: fails to compile with clang:dev. See task #4412111 // TODO: fails to compile with clang:dev. See task #4412111
#ifndef __clang__ #ifndef __clang__
#include <folly/wangle/futures/test/Thens.h> #include <folly/futures/test/Thens.h>
TEST(Future, thenVariants) { TEST(Future, thenVariants) {
SomeClass anObject; SomeClass anObject;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <memory> #include <memory>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/Executor.h> #include <folly/Executor.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/wangle/futures/Timekeeper.h> #include <folly/futures/Timekeeper.h>
#include <unistd.h> #include <unistd.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/wangle/futures/Try.h> #include <folly/futures/Try.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <thread> #include <thread>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/futures/InlineExecutor.h> #include <folly/futures/InlineExecutor.h>
#include <folly/wangle/futures/ManualExecutor.h> #include <folly/futures/ManualExecutor.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -66,7 +66,7 @@ print <<EOF ...@@ -66,7 +66,7 @@ print <<EOF
// TODO: fails to compile with clang:dev. See task #4412111 // TODO: fails to compile with clang:dev. See task #4412111
#ifndef __clang__ #ifndef __clang__
#include <folly/wangle/futures/test/Thens.h> #include <folly/futures/test/Thens.h>
TEST(Future, thenVariants) { TEST(Future, thenVariants) {
SomeClass anObject; SomeClass anObject;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/wangle/channel/ChannelPipeline.h> #include <folly/wangle/channel/ChannelPipeline.h>
#include <folly/io/IOBuf.h> #include <folly/io/IOBuf.h>
#include <folly/io/IOBufQueue.h> #include <folly/io/IOBufQueue.h>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <folly/io/async/AsyncTransport.h> #include <folly/io/async/AsyncTransport.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/ExceptionWrapper.h> #include <folly/ExceptionWrapper.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <folly/wangle/channel/ChannelHandlerContext.h> #include <folly/wangle/channel/ChannelHandlerContext.h>
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
#include <folly/io/async/AsyncTransport.h> #include <folly/io/async/AsyncTransport.h>
#include <folly/io/async/DelayedDestruction.h> #include <folly/io/async/DelayedDestruction.h>
#include <folly/ExceptionWrapper.h> #include <folly/ExceptionWrapper.h>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#pragma once #pragma once
#include <folly/wangle/futures/Future.h> #include <folly/futures/Future.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
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