X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=3fc4644bee6f18f4e4a6add6a43582c8093efc48;hb=44dcd737f7e77320d8d1380e483f93a82dc9a970;hp=00796bb46390c88016efe9b2d38c65d16576f105;hpb=c1a1a5e6039c13c55597fa942ce1c01ecfe2f6a3;p=folly.git diff --git a/folly/Makefile.am b/folly/Makefile.am index 00796bb4..3fc4644b 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -2,12 +2,10 @@ if FOLLY_TESTMAIN MAYBE_INIT = init endif -if EXCEPTION_TRACER -MAYBE_EXCEPTION_TRACER = experimental/exception_tracer -endif - -SUBDIRS = . experimental $(MAYBE_INIT) test io/test experimental/io/test \ - $(MAYBE_EXCEPTION_TRACER) +# Note that the order of SUBDIRS matters. +# Many subdirectories depend on libfollytest from the test directory, +# so it must appear before other directories +SUBDIRS = . test experimental $(MAYBE_INIT) io/test stats/test ACLOCAL_AMFLAGS = -I m4 @@ -29,7 +27,6 @@ lib_LTLIBRARIES = \ follyincludedir = $(includedir)/folly nobase_follyinclude_HEADERS = \ - ApplyTuple.h \ Arena.h \ Arena-inl.h \ Array.h \ @@ -47,8 +44,6 @@ nobase_follyinclude_HEADERS = \ Benchmark.h \ Bits.h \ CachelinePadded.h \ - CallOnce.h \ - Checksum.h \ Chrono.h \ ClockGettimeWrappers.h \ ConcurrentSkipList.h \ @@ -58,15 +53,16 @@ nobase_follyinclude_HEADERS = \ CppAttributes.h \ CpuId.h \ CPortability.h \ + concurrency/CacheLocality.h \ + concurrency/ConcurrentHashMap.h \ concurrency/CoreCachedSharedPtr.h \ + concurrency/GlobalThreadPoolList.h \ + concurrency/detail/ConcurrentHashMap-detail.h \ + ConstexprMath.h \ detail/AtomicHashUtils.h \ detail/AtomicUnorderedMapUtils.h \ detail/AtomicUtils.h \ detail/BitIteratorDetail.h \ - detail/BitsDetail.h \ - detail/CacheLocality.h \ - detail/CachelinePaddedImpl.h \ - detail/ChecksumDetail.h \ detail/DiscriminatedPtrDetail.h \ detail/FileUtilDetail.h \ detail/FingerprintPolynomial.h \ @@ -74,7 +70,7 @@ nobase_follyinclude_HEADERS = \ detail/GroupVarintDetail.h \ detail/IPAddress.h \ detail/IPAddressSource.h \ - detail/Malloc.h \ + detail/MallocImpl.h \ detail/MemoryIdler.h \ detail/MPMCPipelineDetail.h \ detail/RangeCommon.h \ @@ -83,11 +79,32 @@ nobase_follyinclude_HEADERS = \ detail/SlowFingerprint.h \ detail/SocketFastOpen.h \ detail/StaticSingletonManager.h \ - detail/Stats.h \ detail/ThreadLocalDetail.h \ - detail/TryDetail.h \ detail/TurnSequencer.h \ detail/UncaughtExceptionCounter.h \ + executors/Async.h \ + executors/CPUThreadPoolExecutor.h \ + executors/Codel.h \ + executors/DrivableExecutor.h \ + executors/FiberIOExecutor.h \ + executors/FutureExecutor.h \ + executors/GlobalExecutor.h \ + executors/IOExecutor.h \ + executors/IOObjectCache.h \ + executors/IOThreadPoolExecutor.h \ + executors/NotificationQueueExecutor.h \ + executors/ScheduledExecutor.h \ + executors/SerialExecutor.h \ + executors/ThreadPoolExecutor.h \ + executors/ThreadedExecutor.h \ + executors/task_queue/BlockingQueue.h \ + executors/task_queue/LifoSemMPMCQueue.h \ + executors/task_queue/PriorityLifoSemMPMCQueue.h \ + executors/task_queue/UnboundedBlockingQueue.h \ + executors/thread_factory/NamedThreadFactory.h \ + executors/thread_factory/PriorityThreadFactory.h \ + executors/thread_factory/ThreadFactory.h \ + functional/ApplyTuple.h \ Demangle.h \ DiscriminatedPtr.h \ DynamicConverter.h \ @@ -101,9 +118,9 @@ nobase_follyinclude_HEADERS = \ ExceptionWrapper-inl.h \ Executor.h \ Expected.h \ + concurrency/AtomicSharedPtr.h \ + concurrency/detail/AtomicSharedPtr-detail.h \ experimental/AsymmetricMemoryBarrier.h \ - experimental/AtomicSharedPtr.h \ - experimental/detail/AtomicSharedPtr-detail.h \ experimental/AutoTimer.h \ experimental/ThreadedRepeatingFunctionRunner.h \ experimental/Bits.h \ @@ -124,10 +141,33 @@ nobase_follyinclude_HEADERS = \ experimental/exception_tracer/StackTrace.h \ experimental/FunctionScheduler.h \ experimental/FutureDAG.h \ + experimental/hazptr/debug.h \ + experimental/hazptr/hazptr.h \ + experimental/hazptr/hazptr-impl.h \ + experimental/hazptr/memory_resource.h \ experimental/io/FsUtil.h \ experimental/JemallocNodumpAllocator.h \ experimental/JSONSchema.h \ experimental/LockFreeRingBuffer.h \ + experimental/logging/AsyncFileWriter.h \ + experimental/logging/GlogStyleFormatter.h \ + experimental/logging/ImmediateFileWriter.h \ + experimental/logging/Init.h \ + experimental/logging/LogCategory.h \ + experimental/logging/LogFormatter.h \ + experimental/logging/Logger.h \ + experimental/logging/LoggerDB.h \ + experimental/logging/LogHandler.h \ + experimental/logging/LogLevel.h \ + experimental/logging/LogMessage.h \ + experimental/logging/LogName.h \ + experimental/logging/LogStream.h \ + experimental/logging/LogStreamProcessor.h \ + experimental/logging/LogWriter.h \ + experimental/logging/printf.h \ + experimental/logging/RateLimiter.h \ + experimental/logging/StandardLogHandler.h \ + experimental/logging/xlog.h \ experimental/NestedCommandLineApp.h \ experimental/observer/detail/Core.h \ experimental/observer/detail/GraphCycleDetector.h \ @@ -141,14 +181,6 @@ nobase_follyinclude_HEADERS = \ experimental/observer/SimpleObservable-inl.h \ experimental/ProgramOptions.h \ experimental/ReadMostlySharedPtr.h \ - experimental/symbolizer/Elf.h \ - experimental/symbolizer/Elf-inl.h \ - experimental/symbolizer/ElfCache.h \ - experimental/symbolizer/Dwarf.h \ - experimental/symbolizer/LineReader.h \ - experimental/symbolizer/SignalHandler.h \ - experimental/symbolizer/StackTrace.h \ - experimental/symbolizer/Symbolizer.h \ experimental/Select64.h \ experimental/StampedPtr.h \ experimental/StringKeyedCommon.h \ @@ -167,12 +199,14 @@ nobase_follyinclude_HEADERS = \ FixedString.h \ folly-config.h \ Foreach.h \ + Foreach-inl.h \ FormatArg.h \ FormatTraits.h \ Format.h \ Format-inl.h \ + functional/Invoke.h \ + functional/Partial.h \ futures/Barrier.h \ - futures/DrivableExecutor.h \ futures/Future-pre.h \ futures/helpers.h \ futures/Future.h \ @@ -181,11 +215,8 @@ nobase_follyinclude_HEADERS = \ futures/FutureSplitter.h \ futures/InlineExecutor.h \ futures/ManualExecutor.h \ - futures/OpaqueCallbackShunt.h \ futures/Promise-inl.h \ futures/Promise.h \ - futures/QueuedImmediateExecutor.h \ - futures/ScheduledExecutor.h \ futures/SharedPromise.h \ futures/SharedPromise-inl.h \ futures/ThreadWheelTimekeeper.h \ @@ -194,6 +225,10 @@ nobase_follyinclude_HEADERS = \ futures/detail/FSM.h \ futures/detail/Types.h \ futures/test/TestExecutor.h \ + hash/Checksum.h \ + hash/detail/ChecksumDetail.h \ + hash/SpookyHashV1.h \ + hash/SpookyHashV2.h \ gen/Base.h \ gen/Base-inl.h \ gen/Combine.h \ @@ -256,6 +291,7 @@ nobase_follyinclude_HEADERS = \ io/async/ssl/TLSDefinitions.h \ io/async/Request.h \ io/async/SSLContext.h \ + io/async/SSLOptions.h \ io/async/ScopedEventBaseThread.h \ io/async/TimeoutManager.h \ io/async/VirtualEventBase.h \ @@ -275,8 +311,11 @@ nobase_follyinclude_HEADERS = \ io/async/test/TimeUtil.h \ io/async/test/UndelayedDestruction.h \ io/async/test/Util.h \ + io/compression/Utils.h \ + io/compression/Zlib.h \ Iterator.h \ json.h \ + Launder.h \ Lazy.h \ LifoSem.h \ Likely.h \ @@ -284,12 +323,13 @@ nobase_follyinclude_HEADERS = \ LockTraitsBoost.h \ Logging.h \ MacAddress.h \ - MallctlHelper.h \ Malloc.h \ MapUtil.h \ Math.h \ Memory.h \ MemoryMapping.h \ + memory/MallctlHelper.h \ + memory/UninitializedMemoryHacks.h \ MicroSpinLock.h \ MicroLock.h \ MoveWrapper.h \ @@ -299,7 +339,6 @@ nobase_follyinclude_HEADERS = \ Overload.h \ PackedSyncPtr.h \ Padded.h \ - Partial.h \ PicoSpinLock.h \ Portability.h \ portability/Asm.h \ @@ -321,6 +360,7 @@ nobase_follyinclude_HEADERS = \ portability/Memory.h \ portability/OpenSSL.h \ portability/PThread.h \ + portability/Semaphore.h \ portability/Sockets.h \ portability/Stdio.h \ portability/Stdlib.h \ @@ -337,14 +377,15 @@ nobase_follyinclude_HEADERS = \ portability/SysUio.h \ portability/Time.h \ portability/TypeTraits.h \ - portability/Windows.h \ portability/Unistd.h \ + portability/Windows.h \ Preprocessor.h \ PriorityMPMCQueue.h \ ProducerConsumerQueue.h \ Random.h \ Random-inl.h \ Range.h \ + Replaceable.h \ RWSpinLock.h \ SafeAssert.h \ ScopeGuard.h \ @@ -359,14 +400,16 @@ nobase_follyinclude_HEADERS = \ sorted_vector_types.h \ SparseByteSet.h \ SpinLock.h \ - SpookyHashV1.h \ - SpookyHashV2.h \ + ssl/Init.h \ ssl/OpenSSLCertUtils.h \ ssl/OpenSSLHash.h \ ssl/OpenSSLPtrTypes.h \ ssl/OpenSSLVersionFinder.h \ ssl/SSLSession.h \ + ssl/OpenSSLLockTypes.h \ + ssl/detail/OpenSSLThreading.h \ ssl/detail/SSLSessionImpl.h \ + stats/detail/Bucket.h \ stats/BucketedTimeSeries-defs.h \ stats/BucketedTimeSeries.h \ stats/Histogram-defs.h \ @@ -375,11 +418,13 @@ nobase_follyinclude_HEADERS = \ stats/MultiLevelTimeSeries.h \ stats/TimeseriesHistogram-defs.h \ stats/TimeseriesHistogram.h \ + synchronization/CallOnce.h \ stop_watch.h \ String.h \ String-inl.h \ Subprocess.h \ Synchronized.h \ + SynchronizedPtr.h \ test/FBStringTestBenchmarks.cpp.h \ test/FBVectorTestBenchmarks.cpp.h \ test/function_benchmark/benchmark_impl.h \ @@ -395,6 +440,7 @@ nobase_follyinclude_HEADERS = \ TimeoutQueue.h \ TokenBucket.h \ tracing/StaticTracepoint.h \ + tracing/ScopedTraceSection.h \ Traits.h \ Try-inl.h \ Try.h \ @@ -422,8 +468,9 @@ GroupVarintTables.cpp: build/generate_varint_tables.py CLEANFILES += GroupVarintTables.cpp libfollybasesse42_la_SOURCES = \ - detail/ChecksumDetail.cpp \ - detail/RangeSse42.cpp + detail/RangeSse42.cpp \ + hash/detail/ChecksumDetail.cpp \ + hash/detail/Crc32cDetail.cpp libfollybase_la_SOURCES = \ Conv.cpp \ @@ -431,20 +478,22 @@ libfollybase_la_SOURCES = \ detail/RangeCommon.cpp \ EscapeTables.cpp \ Format.cpp \ + FormatArg.cpp \ FormatTables.cpp \ - MallctlHelper.cpp \ + memory/MallctlHelper.cpp \ portability/BitsFunctexcept.cpp \ - StringBase.cpp \ String.cpp \ Unicode.cpp libfolly_la_SOURCES = \ Assume.cpp \ - Bits.cpp \ - Checksum.cpp \ ClockGettimeWrappers.cpp \ - detail/CacheLocality.cpp \ + concurrency/CacheLocality.cpp \ + concurrency/GlobalThreadPoolList.cpp \ + detail/Futex.cpp \ detail/IPAddress.cpp \ + detail/StaticSingletonManager.cpp \ + detail/ThreadLocalDetail.cpp \ dynamic.cpp \ ExceptionWrapper.cpp \ Executor.cpp \ @@ -453,16 +502,26 @@ libfolly_la_SOURCES = \ FingerprintTables.cpp \ futures/Barrier.cpp \ futures/Future.cpp \ + futures/FutureException.cpp \ futures/InlineExecutor.cpp \ futures/ManualExecutor.cpp \ - futures/QueuedImmediateExecutor.cpp \ futures/ThreadWheelTimekeeper.cpp \ futures/test/TestExecutor.cpp \ - detail/Futex.cpp \ - detail/StaticSingletonManager.cpp \ - detail/ThreadLocalDetail.cpp \ + executors/CPUThreadPoolExecutor.cpp \ + executors/Codel.cpp \ + executors/GlobalExecutor.cpp \ + executors/IOThreadPoolExecutor.cpp \ + executors/SerialExecutor.cpp \ + executors/ThreadPoolExecutor.cpp \ + executors/ThreadedExecutor.cpp \ + executors/QueuedImmediateExecutor.cpp \ + experimental/hazptr/hazptr.cpp \ + experimental/hazptr/memory_resource.cpp \ GroupVarint.cpp \ GroupVarintTables.cpp \ + hash/Checksum.cpp \ + hash/SpookyHashV1.cpp \ + hash/SpookyHashV2.cpp \ IPAddress.cpp \ IPAddressV4.cpp \ IPAddressV6.cpp \ @@ -480,6 +539,7 @@ libfolly_la_SOURCES = \ io/async/AsyncServerSocket.cpp \ io/async/AsyncSignalHandler.cpp \ io/async/AsyncSocket.cpp \ + io/async/AsyncSocketException.cpp \ io/async/AsyncSSLSocket.cpp \ io/async/EventBase.cpp \ io/async/EventBaseLocal.cpp \ @@ -488,6 +548,7 @@ libfolly_la_SOURCES = \ io/async/EventHandler.cpp \ io/async/Request.cpp \ io/async/SSLContext.cpp \ + io/async/SSLOptions.cpp \ io/async/ScopedEventBaseThread.cpp \ io/async/VirtualEventBase.cpp \ io/async/HHWheelTimer.cpp \ @@ -497,6 +558,7 @@ libfolly_la_SOURCES = \ io/async/test/TimeUtil.cpp \ io/async/ssl/OpenSSLUtils.cpp \ io/async/ssl/SSLErrors.cpp \ + io/compression/Zlib.cpp \ json.cpp \ detail/MemoryIdler.cpp \ detail/SocketFastOpen.cpp \ @@ -531,16 +593,20 @@ libfolly_la_SOURCES = \ Optional.cpp \ Singleton.cpp \ SocketAddress.cpp \ - SpookyHashV1.cpp \ - SpookyHashV2.cpp \ + ssl/Init.cpp \ ssl/OpenSSLCertUtils.cpp \ ssl/OpenSSLHash.cpp \ + ssl/detail/OpenSSLThreading.cpp \ ssl/detail/SSLSessionImpl.cpp \ - stats/Instantiations.cpp \ + stats/BucketedTimeSeries.cpp \ + stats/Histogram.cpp \ + stats/MultiLevelTimeSeries.cpp \ + stats/TimeseriesHistogram.cpp \ Subprocess.cpp \ ThreadCachedArena.cpp \ ThreadName.cpp \ TimeoutQueue.cpp \ + Try.cpp \ Uri.cpp \ Version.cpp \ experimental/AsymmetricMemoryBarrier.cpp \ @@ -618,6 +684,27 @@ libfolly_la_SOURCES += \ fibers/TimeoutController.cpp endif +if USE_SYMBOLIZER +nobase_follyinclude_HEADERS += \ + experimental/symbolizer/Elf.h \ + experimental/symbolizer/Elf-inl.h \ + experimental/symbolizer/ElfCache.h \ + experimental/symbolizer/Dwarf.h \ + experimental/symbolizer/LineReader.h \ + experimental/symbolizer/SignalHandler.h \ + experimental/symbolizer/StackTrace.h \ + experimental/symbolizer/Symbolizer.h + +libfolly_la_SOURCES += \ + experimental/symbolizer/Elf.cpp \ + experimental/symbolizer/ElfCache.cpp \ + experimental/symbolizer/Dwarf.cpp \ + experimental/symbolizer/LineReader.cpp \ + experimental/symbolizer/SignalHandler.cpp \ + experimental/symbolizer/StackTrace.cpp \ + experimental/symbolizer/Symbolizer.cpp +endif + libfollybasesse42_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) libfollybasesse42_la_CXXFLAGS = -msse4.2 -mpclmul