X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2FMakefile.am;h=d37966b3845faaa774edbdbf0dc3a1cf9be32ac2;hp=d2377fa5e237652f650314dd15095d01ccef8df7;hb=ebcef6dcbcd0c0c7a532d8a477e2af14627832d2;hpb=fff701bfc7db2f23becae9da222a63a7ad86177b diff --git a/folly/Makefile.am b/folly/Makefile.am index d2377fa5..d37966b3 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -1,4 +1,8 @@ +if FOLLY_TESTMAIN +SUBDIRS = . experimental init test +else SUBDIRS = . test +endif ACLOCAL_AMFLAGS = -I m4 @@ -21,24 +25,29 @@ nobase_follyinclude_HEADERS = \ ApplyTuple.h \ Arena.h \ Arena-inl.h \ + Assume.h \ AtomicBitSet.h \ AtomicHashArray.h \ AtomicHashArray-inl.h \ AtomicHashMap.h \ AtomicHashMap-inl.h \ + AtomicIntrusiveLinkedList.h \ AtomicLinkedList.h \ AtomicStruct.h \ + AtomicUnorderedMap.h \ + CppAttributes.h \ Baton.h \ Benchmark.h \ Bits.h \ Checksum.h \ - Chrono.h \ ConcurrentSkipList.h \ ConcurrentSkipList-inl.h \ + ContainerTraits.h \ Conv.h \ CpuId.h \ CPortability.h \ detail/AtomicHashUtils.h \ + detail/AtomicUnorderedMapUtils.h \ detail/BitIteratorDetail.h \ detail/BitsDetail.h \ detail/CacheLocality.h \ @@ -55,6 +64,9 @@ nobase_follyinclude_HEADERS = \ detail/Malloc.h \ detail/MemoryIdler.h \ detail/MPMCPipelineDetail.h \ + detail/RangeCommon.h \ + detail/RangeSse42.h \ + detail/Sleeper.h \ detail/SlowFingerprint.h \ detail/SpinLockImpl.h \ detail/Stats.h \ @@ -72,9 +84,12 @@ 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/bser/Bser.h \ experimental/fibers/AddTasks.h \ experimental/fibers/AddTasks-inl.h \ experimental/fibers/Baton.h \ @@ -91,11 +106,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 \ @@ -105,13 +121,24 @@ nobase_follyinclude_HEADERS = \ experimental/io/FsUtil.h \ experimental/JSONSchema.h \ experimental/LockFreeRingBuffer.h \ + experimental/NestedCommandLineApp.h \ + experimental/ProgramOptions.h \ + experimental/ReadMostlySharedPtr.h \ + experimental/symbolizer/Elf.h \ + experimental/symbolizer/ElfCache.h \ + experimental/symbolizer/Dwarf.h \ + experimental/symbolizer/LineReader.h \ + experimental/symbolizer/SignalHandler.h \ + experimental/symbolizer/StackTrace.cpp \ + experimental/symbolizer/Symbolizer.h \ experimental/Select64.h \ - experimental/SharedMutex.h \ experimental/StringKeyedCommon.h \ experimental/StringKeyedUnorderedMap.h \ experimental/StringKeyedUnorderedSet.h \ experimental/TestUtil.h \ + experimental/TLRefCount.h \ experimental/TupleOps.h \ + SparseByteSet.h \ FBString.h \ FBVector.h \ File.h \ @@ -120,9 +147,11 @@ nobase_follyinclude_HEADERS = \ folly-config.h \ Foreach.h \ FormatArg.h \ + FormatTraits.h \ Format.h \ Format-inl.h \ - futures/Deprecated.h \ + futures/Barrier.h \ + futures/ThreadedExecutor.h \ futures/DrivableExecutor.h \ futures/Future-pre.h \ futures/helpers.h \ @@ -138,13 +167,13 @@ nobase_follyinclude_HEADERS = \ futures/ScheduledExecutor.h \ futures/SharedPromise.h \ futures/SharedPromise-inl.h \ + futures/ThreadWheelTimekeeper.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 \ futures/detail/Types.h \ gen/Base.h \ gen/Base-inl.h \ @@ -167,6 +196,7 @@ nobase_follyinclude_HEADERS = \ IPAddressV6.h \ IPAddressException.h \ IndexedMemPool.h \ + init/Init.h \ IntrusiveList.h \ io/Compression.h \ io/Cursor.h \ @@ -176,6 +206,7 @@ nobase_follyinclude_HEADERS = \ io/RecordIO-inl.h \ io/TypedIOBuf.h \ io/ShutdownSocketSet.h \ + io/async/AsyncPipe.h \ io/async/AsyncTimeout.h \ io/async/AsyncTransport.h \ io/async/AsyncUDPServerSocket.h \ @@ -186,16 +217,20 @@ nobase_follyinclude_HEADERS = \ io/async/AsyncSocketBase.h \ io/async/AsyncSSLSocket.h \ io/async/AsyncSocketException.h \ + io/async/DelayedDestructionBase.h \ io/async/DelayedDestruction.h \ io/async/EventBase.h \ + io/async/EventBaseLocal.h \ io/async/EventBaseManager.h \ io/async/EventFDWrapper.h \ io/async/EventHandler.h \ io/async/EventUtil.h \ io/async/NotificationQueue.h \ io/async/HHWheelTimer.h \ + io/async/OpenSSLPtrTypes.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 \ @@ -203,6 +238,8 @@ nobase_follyinclude_HEADERS = \ io/async/test/MockAsyncServerSocket.h \ io/async/test/MockAsyncSSLSocket.h \ io/async/test/MockAsyncTransport.h \ + io/async/test/MockAsyncUDPSocket.h \ + io/async/test/SocketPair.h \ io/async/test/TimeUtil.h \ io/async/test/UndelayedDestruction.h \ io/async/test/Util.h \ @@ -216,13 +253,16 @@ nobase_follyinclude_HEADERS = \ MapUtil.h \ Memory.h \ MemoryMapping.h \ + MicroSpinLock.h \ MoveWrapper.h \ MPMCPipeline.h \ MPMCQueue.h \ Optional.h \ PackedSyncPtr.h \ Padded.h \ + PicoSpinLock.h \ Portability.h \ + portability/Syscall.h \ Preprocessor.h \ ProducerConsumerQueue.h \ Random.h \ @@ -230,6 +270,7 @@ nobase_follyinclude_HEADERS = \ Range.h \ RWSpinLock.h \ ScopeGuard.h \ + SharedMutex.h \ Singleton.h \ Singleton-inl.h \ SmallLocks.h \ @@ -245,6 +286,8 @@ nobase_follyinclude_HEADERS = \ stats/Histogram.h \ stats/MultiLevelTimeSeries-defs.h \ stats/MultiLevelTimeSeries.h \ + stats/TimeseriesHistogram-defs.h \ + stats/TimeseriesHistogram.h \ String.h \ String-inl.h \ Subprocess.h \ @@ -255,6 +298,7 @@ nobase_follyinclude_HEADERS = \ test/function_benchmark/test_functions.h \ test/SynchronizedTestLib.h \ test/SynchronizedTestLib-inl.h \ + test/TestUtils.h \ ThreadCachedArena.h \ ThreadCachedInt.h \ ThreadLocal.h \ @@ -265,97 +309,49 @@ 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/FiberIOExecutor.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 = \ Conv.cpp \ Demangle.cpp \ + detail/RangeCommon.cpp \ + detail/RangeSse42.cpp \ EscapeTables.cpp \ Format.cpp \ FormatTables.cpp \ - Malloc.cpp \ - Range.cpp \ StringBase.cpp \ String.cpp \ Unicode.cpp libfolly_la_SOURCES = \ Bits.cpp \ + Checksum.cpp \ detail/CacheLocality.cpp \ dynamic.cpp \ File.cpp \ FileUtil.cpp \ FingerprintTables.cpp \ - futures/detail/ThreadWheelTimekeeper.cpp \ + futures/Barrier.cpp \ + futures/ThreadedExecutor.cpp \ futures/Future.cpp \ futures/InlineExecutor.cpp \ futures/ManualExecutor.cpp \ futures/QueuedImmediateExecutor.cpp \ + futures/ThreadWheelTimekeeper.cpp \ detail/Futex.cpp \ + detail/ThreadLocalDetail.cpp \ GroupVarint.cpp \ GroupVarintTables.cpp \ IPAddress.cpp \ @@ -367,6 +363,7 @@ libfolly_la_SOURCES = \ io/IOBufQueue.cpp \ io/RecordIO.cpp \ io/ShutdownSocketSet.cpp \ + io/async/AsyncPipe.cpp \ io/async/AsyncTimeout.cpp \ io/async/AsyncUDPSocket.cpp \ io/async/AsyncServerSocket.cpp \ @@ -374,10 +371,13 @@ libfolly_la_SOURCES = \ io/async/AsyncSocket.cpp \ io/async/AsyncSSLSocket.cpp \ io/async/EventBase.cpp \ + io/async/EventBaseLocal.cpp \ io/async/EventBaseManager.cpp \ io/async/EventHandler.cpp \ io/async/SSLContext.cpp \ + io/async/ScopedEventBaseThread.cpp \ io/async/HHWheelTimer.cpp \ + io/async/test/SocketPair.cpp \ io/async/test/TimeUtil.cpp \ json.cpp \ detail/MemoryIdler.cpp \ @@ -385,8 +385,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 \ @@ -395,34 +396,21 @@ libfolly_la_SOURCES = \ TimeoutQueue.cpp \ Uri.cpp \ Version.cpp \ + experimental/bser/Dump.cpp \ + experimental/bser/Load.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/NestedCommandLineApp.cpp \ + experimental/ProgramOptions.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 += \ @@ -432,7 +420,6 @@ libfolly_la_SOURCES += \ endif if !HAVE_LINUX -nobase_follyinclude_HEADERS += detail/Clock.h libfollybase_la_SOURCES += detail/Clock.cpp endif