X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2FMakefile.am;h=0401ce6b1fb3c1c71de8fdba55447621f558b568;hp=2220cecae943a683d66e74aaf84ffebc32ad35bc;hb=0f383c3789e8ca0caa5b086fde1a28af44e0a450;hpb=d5550513ae99ac1a9c59bb7a7dcd86e03739b890 diff --git a/folly/Makefile.am b/folly/Makefile.am index 2220ceca..0401ce6b 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -28,6 +28,7 @@ nobase_follyinclude_HEADERS = \ AtomicHashMap-inl.h \ AtomicLinkedList.h \ AtomicStruct.h \ + AtomicUnorderedMap.h \ Baton.h \ Benchmark.h \ Bits.h \ @@ -39,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 \ @@ -59,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 \ @@ -71,8 +74,11 @@ nobase_follyinclude_HEADERS = \ EvictingCacheMap.h \ experimental/AutoTimer.h \ experimental/Bits.h \ + experimental/BitVectorCoding.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 \ @@ -80,10 +86,8 @@ nobase_follyinclude_HEADERS = \ experimental/fibers/BoostContextCompatibility.h \ experimental/fibers/EventBaseLoopController.h \ experimental/fibers/EventBaseLoopController-inl.h \ - experimental/fibers/ExecutionObserver.h \ experimental/fibers/Fiber.h \ experimental/fibers/Fiber-inl.h \ - experimental/fibers/FiberIOExecutor.h \ experimental/fibers/FiberManager.h \ experimental/fibers/FiberManager-inl.h \ experimental/fibers/FiberManagerMap.h \ @@ -91,11 +95,12 @@ nobase_follyinclude_HEADERS = \ experimental/fibers/ForEach-inl.h \ experimental/fibers/GenericBaton.h \ experimental/fibers/GuardPageAllocator.h \ - experimental/fibers/GuardPageAllocator-inl.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 \ @@ -104,8 +109,8 @@ nobase_follyinclude_HEADERS = \ experimental/FutureDAG.h \ experimental/io/FsUtil.h \ experimental/JSONSchema.h \ + experimental/LockFreeRingBuffer.h \ experimental/Select64.h \ - experimental/SharedMutex.h \ experimental/StringKeyedCommon.h \ experimental/StringKeyedUnorderedMap.h \ experimental/StringKeyedUnorderedSet.h \ @@ -119,6 +124,7 @@ nobase_follyinclude_HEADERS = \ folly-config.h \ Foreach.h \ FormatArg.h \ + FormatTraits.h \ Format.h \ Format-inl.h \ futures/Deprecated.h \ @@ -195,6 +201,7 @@ nobase_follyinclude_HEADERS = \ io/async/HHWheelTimer.h \ io/async/Request.h \ io/async/SSLContext.h \ + io/async/ScopedEventBaseThread.h \ io/async/TimeoutManager.h \ io/async/test/AsyncSSLSocketTest.h \ io/async/test/BlockingSocket.h \ @@ -229,6 +236,7 @@ nobase_follyinclude_HEADERS = \ Range.h \ RWSpinLock.h \ ScopeGuard.h \ + SharedMutex.h \ Singleton.h \ Singleton-inl.h \ SmallLocks.h \ @@ -264,69 +272,18 @@ nobase_follyinclude_HEADERS = \ Uri.h \ Uri-inl.h \ Varint.h \ - VersionCheck.h \ - wangle/acceptor/Acceptor.h \ - wangle/acceptor/ConnectionCounter.h \ - wangle/acceptor/ConnectionManager.h \ - wangle/acceptor/DomainNameMisc.h \ - wangle/acceptor/LoadShedConfiguration.h \ - wangle/acceptor/ManagedConnection.h \ - wangle/acceptor/NetworkAddress.h \ - wangle/acceptor/ServerSocketConfig.h \ - wangle/acceptor/SocketOptions.h \ - 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/EventBaseHandler.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/FutureExecutor.h \ - wangle/concurrent/IOExecutor.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/ssl/ClientHelloExtStats.h \ - wangle/ssl/DHParam.h \ - wangle/ssl/PasswordInFile.h \ - wangle/ssl/SSLCacheOptions.h \ - wangle/ssl/SSLCacheProvider.h \ - wangle/ssl/SSLContextConfig.h \ - wangle/ssl/SSLContextManager.h \ - wangle/ssl/SSLSessionCacheManager.h \ - wangle/ssl/SSLStats.h \ - wangle/ssl/SSLUtil.h \ - wangle/ssl/TLSTicketKeyManager.h \ - wangle/ssl/TLSTicketKeySeeds.h + VersionCheck.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 = \ @@ -337,6 +294,7 @@ libfollybase_la_SOURCES = \ FormatTables.cpp \ Malloc.cpp \ Range.cpp \ + StringBase.cpp \ String.cpp \ Unicode.cpp @@ -373,8 +331,8 @@ libfolly_la_SOURCES = \ io/async/EventBase.cpp \ io/async/EventBaseManager.cpp \ io/async/EventHandler.cpp \ - io/async/Request.cpp \ io/async/SSLContext.cpp \ + io/async/ScopedEventBaseThread.cpp \ io/async/HHWheelTimer.cpp \ io/async/test/TimeUtil.cpp \ json.cpp \ @@ -383,8 +341,9 @@ libfolly_la_SOURCES = \ MemoryMapping.cpp \ Random.cpp \ SafeAssert.cpp \ - SocketAddress.cpp \ + SharedMutex.cpp \ Singleton.cpp \ + SocketAddress.cpp \ SpookyHashV1.cpp \ SpookyHashV2.cpp \ stats/Instantiations.cpp \ @@ -397,30 +356,13 @@ libfolly_la_SOURCES = \ 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/TestUtil.cpp \ - wangle/acceptor/Acceptor.cpp \ - wangle/acceptor/ConnectionManager.cpp \ - wangle/acceptor/LoadShedConfiguration.cpp \ - wangle/acceptor/ManagedConnection.cpp \ - wangle/acceptor/SocketOptions.cpp \ - wangle/acceptor/TransportInfo.cpp \ - wangle/bootstrap/ServerBootstrap.cpp \ - wangle/concurrent/CPUThreadPoolExecutor.cpp \ - wangle/concurrent/Codel.cpp \ - wangle/concurrent/IOThreadPoolExecutor.cpp \ - wangle/concurrent/GlobalExecutor.cpp \ - wangle/concurrent/ThreadPoolExecutor.cpp \ - wangle/ssl/PasswordInFile.cpp \ - wangle/ssl/SSLContextManager.cpp \ - wangle/ssl/SSLSessionCacheManager.cpp \ - wangle/ssl/SSLUtil.cpp \ - wangle/ssl/TLSTicketKeyManager.cpp + experimental/TestUtil.cpp if HAVE_LINUX nobase_follyinclude_HEADERS += \ @@ -430,7 +372,6 @@ libfolly_la_SOURCES += \ endif if !HAVE_LINUX -nobase_follyinclude_HEADERS += detail/Clock.h libfollybase_la_SOURCES += detail/Clock.cpp endif