X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=folly%2FMakefile.am;h=d85c052d8ceaea1a322b40c1d3f57758bf841f24;hb=668192ca7476ebc5a858056ca9598a3fc2eb2240;hp=ef4240e3a6bbd8c74a23f0970772012f06cb9adf;hpb=349834b34a3e048e7a6064f6a7036ae16e780db7;p=folly.git diff --git a/folly/Makefile.am b/folly/Makefile.am index ef4240e3..d85c052d 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -26,7 +26,9 @@ nobase_follyinclude_HEADERS = \ AtomicHashArray-inl.h \ AtomicHashMap.h \ AtomicHashMap-inl.h \ + AtomicLinkedList.h \ AtomicStruct.h \ + AtomicUnorderedMap.h \ Baton.h \ Benchmark.h \ Bits.h \ @@ -38,6 +40,7 @@ nobase_follyinclude_HEADERS = \ CpuId.h \ CPortability.h \ detail/AtomicHashUtils.h \ + detail/AtomicUnorderedMapUtils.h \ detail/BitIteratorDetail.h \ detail/BitsDetail.h \ detail/CacheLocality.h \ @@ -58,6 +61,7 @@ nobase_follyinclude_HEADERS = \ detail/SpinLockImpl.h \ detail/Stats.h \ detail/ThreadLocalDetail.h \ + detail/TurnSequencer.h \ detail/UncaughtExceptionCounter.h \ Demangle.h \ DiscriminatedPtr.h \ @@ -70,16 +74,47 @@ nobase_follyinclude_HEADERS = \ EvictingCacheMap.h \ experimental/AutoTimer.h \ experimental/Bits.h \ + experimental/ExecutionObserver.h \ experimental/EliasFanoCoding.h \ experimental/EventCount.h \ + experimental/Instructions.h \ + experimental/fibers/AddTasks.h \ + experimental/fibers/AddTasks-inl.h \ + experimental/fibers/Baton.h \ + experimental/fibers/Baton-inl.h \ + experimental/fibers/BoostContextCompatibility.h \ + experimental/fibers/EventBaseLoopController.h \ + experimental/fibers/EventBaseLoopController-inl.h \ + experimental/fibers/Fiber.h \ + experimental/fibers/Fiber-inl.h \ + experimental/fibers/FiberManager.h \ + experimental/fibers/FiberManager-inl.h \ + experimental/fibers/FiberManagerMap.h \ + experimental/fibers/ForEach.h \ + experimental/fibers/ForEach-inl.h \ + experimental/fibers/GenericBaton.h \ + experimental/fibers/GuardPageAllocator.h \ + experimental/fibers/LoopController.h \ + experimental/fibers/Promise.h \ + experimental/fibers/Promise-inl.h \ + experimental/fibers/SimpleLoopController.h \ + experimental/fibers/TimedMutex.h \ + experimental/fibers/TimedMutex-inl.h \ + experimental/fibers/TimeoutController.h \ + experimental/fibers/traits.h \ + experimental/fibers/WhenN.h \ + experimental/fibers/WhenN-inl.h \ experimental/FunctionScheduler.h \ + experimental/FutureDAG.h \ experimental/io/FsUtil.h \ experimental/JSONSchema.h \ + experimental/LockFreeRingBuffer.h \ experimental/Select64.h \ - experimental/SharedMutex.h - experimental/Singleton.h \ - experimental/Singleton-inl.h \ + experimental/StringKeyedCommon.h \ + experimental/StringKeyedUnorderedMap.h \ + experimental/StringKeyedUnorderedSet.h \ experimental/TestUtil.h \ + experimental/TupleOps.h \ FBString.h \ FBVector.h \ File.h \ @@ -88,12 +123,15 @@ nobase_follyinclude_HEADERS = \ folly-config.h \ Foreach.h \ FormatArg.h \ + FormatTraits.h \ Format.h \ Format-inl.h \ futures/Deprecated.h \ futures/DrivableExecutor.h \ - futures/Future-inl.h \ + futures/Future-pre.h \ + futures/helpers.h \ futures/Future.h \ + futures/Future-inl.h \ futures/FutureException.h \ futures/InlineExecutor.h \ futures/ManualExecutor.h \ @@ -102,9 +140,12 @@ nobase_follyinclude_HEADERS = \ futures/Promise.h \ futures/QueuedImmediateExecutor.h \ futures/ScheduledExecutor.h \ + futures/SharedPromise.h \ + futures/SharedPromise-inl.h \ futures/Timekeeper.h \ futures/Try-inl.h \ futures/Try.h \ + futures/Unit.h \ futures/detail/Core.h \ futures/detail/FSM.h \ futures/detail/ThreadWheelTimekeeper.h \ @@ -144,7 +185,9 @@ nobase_follyinclude_HEADERS = \ io/async/AsyncUDPServerSocket.h \ io/async/AsyncUDPSocket.h \ io/async/AsyncServerSocket.h \ + io/async/AsyncSignalHandler.h \ io/async/AsyncSocket.h \ + io/async/AsyncSocketBase.h \ io/async/AsyncSSLSocket.h \ io/async/AsyncSocketException.h \ io/async/DelayedDestruction.h \ @@ -158,6 +201,12 @@ nobase_follyinclude_HEADERS = \ io/async/Request.h \ io/async/SSLContext.h \ io/async/TimeoutManager.h \ + io/async/test/AsyncSSLSocketTest.h \ + io/async/test/BlockingSocket.h \ + io/async/test/MockAsyncSocket.h \ + io/async/test/MockAsyncServerSocket.h \ + io/async/test/MockAsyncSSLSocket.h \ + io/async/test/MockAsyncTransport.h \ io/async/test/TimeUtil.h \ io/async/test/UndelayedDestruction.h \ io/async/test/Util.h \ @@ -185,6 +234,9 @@ nobase_follyinclude_HEADERS = \ Range.h \ RWSpinLock.h \ ScopeGuard.h \ + SharedMutex.h \ + Singleton.h \ + Singleton-inl.h \ SmallLocks.h \ small_vector.h \ SocketAddress.h \ @@ -231,28 +283,36 @@ nobase_follyinclude_HEADERS = \ wangle/acceptor/TransportInfo.h \ wangle/bootstrap/ServerBootstrap.h \ wangle/bootstrap/ServerBootstrap-inl.h \ + wangle/bootstrap/ServerSocketFactory.h \ wangle/bootstrap/ClientBootstrap.h \ wangle/channel/AsyncSocketHandler.h \ - wangle/channel/ChannelHandler.h \ - wangle/channel/ChannelHandlerContext.h \ - wangle/channel/ChannelPipeline.h \ + wangle/channel/EventBaseHandler.h \ + wangle/channel/FileRegion.h \ + wangle/channel/Handler.h \ + wangle/channel/HandlerContext.h \ + wangle/channel/HandlerContext-inl.h \ wangle/channel/OutputBufferingHandler.h \ + wangle/channel/Pipeline.h \ + wangle/channel/Pipeline-inl.h \ + wangle/channel/StaticPipeline.h \ wangle/concurrent/BlockingQueue.h \ wangle/concurrent/Codel.h \ wangle/concurrent/CPUThreadPoolExecutor.h \ + wangle/concurrent/FiberIOExecutor.h \ wangle/concurrent/FutureExecutor.h \ wangle/concurrent/IOExecutor.h \ + wangle/concurrent/IOObjectCache.h \ wangle/concurrent/IOThreadPoolExecutor.h \ wangle/concurrent/GlobalExecutor.h \ wangle/concurrent/LifoSemMPMCQueue.h \ wangle/concurrent/NamedThreadFactory.h \ wangle/concurrent/ThreadFactory.h \ wangle/concurrent/ThreadPoolExecutor.h \ - wangle/rx/Observable.h \ - wangle/rx/Observer.h \ - wangle/rx/Subject.h \ - wangle/rx/Subscription.h \ - wangle/rx/types.h \ + wangle/deprecated/rx/Observable.h \ + wangle/deprecated/rx/Observer.h \ + wangle/deprecated/rx/Subject.h \ + wangle/deprecated/rx/Subscription.h \ + wangle/deprecated/rx/types.h \ wangle/ssl/ClientHelloExtStats.h \ wangle/ssl/DHParam.h \ wangle/ssl/PasswordInFile.h \ @@ -267,15 +327,15 @@ nobase_follyinclude_HEADERS = \ wangle/ssl/TLSTicketKeySeeds.h FormatTables.cpp: build/generate_format_tables.py - build/generate_format_tables.py + $(PYTHON) build/generate_format_tables.py CLEANFILES += FormatTables.cpp EscapeTables.cpp: build/generate_escape_tables.py - build/generate_escape_tables.py + $(PYTHON) build/generate_escape_tables.py CLEANFILES += EscapeTables.cpp GroupVarintTables.cpp: build/generate_varint_tables.py - build/generate_varint_tables.py + $(PYTHON) build/generate_varint_tables.py CLEANFILES += GroupVarintTables.cpp libfollybase_la_SOURCES = \ @@ -286,6 +346,7 @@ libfollybase_la_SOURCES = \ FormatTables.cpp \ Malloc.cpp \ Range.cpp \ + StringBase.cpp \ String.cpp \ Unicode.cpp @@ -316,12 +377,12 @@ libfolly_la_SOURCES = \ io/async/AsyncTimeout.cpp \ io/async/AsyncUDPSocket.cpp \ io/async/AsyncServerSocket.cpp \ + io/async/AsyncSignalHandler.cpp \ io/async/AsyncSocket.cpp \ io/async/AsyncSSLSocket.cpp \ io/async/EventBase.cpp \ io/async/EventBaseManager.cpp \ io/async/EventHandler.cpp \ - io/async/Request.cpp \ io/async/SSLContext.cpp \ io/async/HHWheelTimer.cpp \ io/async/test/TimeUtil.cpp \ @@ -331,6 +392,8 @@ libfolly_la_SOURCES = \ MemoryMapping.cpp \ Random.cpp \ SafeAssert.cpp \ + SharedMutex.cpp \ + Singleton.cpp \ SocketAddress.cpp \ SpookyHashV1.cpp \ SpookyHashV2.cpp \ @@ -340,12 +403,16 @@ libfolly_la_SOURCES = \ TimeoutQueue.cpp \ Uri.cpp \ Version.cpp \ + experimental/fibers/Baton.cpp \ + experimental/fibers/Fiber.cpp \ + experimental/fibers/FiberManager.cpp \ + experimental/fibers/FiberManagerMap.cpp \ + experimental/fibers/GuardPageAllocator.cpp \ + experimental/fibers/TimeoutController.cpp \ experimental/FunctionScheduler.cpp \ experimental/io/FsUtil.cpp \ experimental/JSONSchema.cpp \ experimental/Select64.cpp \ - experimental/SharedMutex.cpp - experimental/Singleton.cpp \ experimental/TestUtil.cpp \ wangle/acceptor/Acceptor.cpp \ wangle/acceptor/ConnectionManager.cpp \ @@ -354,6 +421,7 @@ libfolly_la_SOURCES = \ wangle/acceptor/SocketOptions.cpp \ wangle/acceptor/TransportInfo.cpp \ wangle/bootstrap/ServerBootstrap.cpp \ + wangle/channel/Pipeline.cpp \ wangle/concurrent/CPUThreadPoolExecutor.cpp \ wangle/concurrent/Codel.cpp \ wangle/concurrent/IOThreadPoolExecutor.cpp \ @@ -373,7 +441,6 @@ libfolly_la_SOURCES += \ endif if !HAVE_LINUX -nobase_follyinclude_HEADERS += detail/Clock.h libfollybase_la_SOURCES += detail/Clock.cpp endif