X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=337b1cd6d351c82155836f25f5a91e9c57f6d0c6;hb=cda07dafe57633439c67473f7c20b5f83316ba03;hp=e629366f12ca74ff6346ed6469465abb082a93dd;hpb=2562ef37a103e642bfd20b88413fcc97bc6a5796;p=folly.git

diff --git a/folly/Makefile.am b/folly/Makefile.am
index e629366f..337b1cd6 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -27,10 +27,6 @@ lib_LTLIBRARIES = \
 follyincludedir = $(includedir)/folly
 
 nobase_follyinclude_HEADERS = \
-	ApplyTuple.h \
-	Arena.h \
-	Arena-inl.h \
-	Array.h \
 	Assume.h \
 	AtomicBitSet.h \
 	AtomicHashArray.h \
@@ -45,8 +41,6 @@ nobase_follyinclude_HEADERS = \
 	Benchmark.h \
 	Bits.h \
 	CachelinePadded.h \
-	CallOnce.h \
-	Checksum.h \
 	Chrono.h \
 	ClockGettimeWrappers.h \
 	ConcurrentSkipList.h \
@@ -56,13 +50,24 @@ nobase_follyinclude_HEADERS = \
 	CppAttributes.h \
 	CpuId.h \
 	CPortability.h \
+	compression/Compression.h \
+	compression/Utils.h \
+	compression/Zlib.h \
 	concurrency/CacheLocality.h \
+	concurrency/ConcurrentHashMap.h \
 	concurrency/CoreCachedSharedPtr.h \
+	concurrency/detail/ConcurrentHashMap-detail.h \
+	container/Array.h \
+	container/Iterator.h \
+	container/Enumerate.h \
+	container/EvictingCacheMap.h \
+	container/Foreach.h \
+	container/Foreach-inl.h \
+	container/SparseByteSet.h \
+	ConstexprMath.h \
 	detail/AtomicHashUtils.h \
 	detail/AtomicUnorderedMapUtils.h \
-	detail/AtomicUtils.h \
 	detail/BitIteratorDetail.h \
-	detail/ChecksumDetail.h \
 	detail/DiscriminatedPtrDetail.h \
 	detail/FileUtilDetail.h \
 	detail/FingerprintPolynomial.h \
@@ -70,7 +75,6 @@ nobase_follyinclude_HEADERS = \
 	detail/GroupVarintDetail.h \
 	detail/IPAddress.h \
 	detail/IPAddressSource.h \
-	detail/MallocImpl.h \
 	detail/MemoryIdler.h \
 	detail/MPMCPipelineDetail.h \
 	detail/RangeCommon.h \
@@ -80,16 +84,38 @@ nobase_follyinclude_HEADERS = \
 	detail/SocketFastOpen.h \
 	detail/StaticSingletonManager.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/GlobalThreadPoolList.h \
+	executors/InlineExecutor.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 \
 	dynamic.h \
 	dynamic-inl.h \
-	Enumerate.h \
-	EvictingCacheMap.h \
 	Exception.h \
 	ExceptionString.h \
 	ExceptionWrapper.h \
@@ -119,6 +145,10 @@ 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 \
@@ -155,14 +185,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 \
@@ -180,25 +202,21 @@ nobase_follyinclude_HEADERS = \
 	Fingerprint.h \
 	FixedString.h \
 	folly-config.h \
-	Foreach.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 \
 	futures/Future-inl.h \
 	futures/FutureException.h \
 	futures/FutureSplitter.h \
-	futures/InlineExecutor.h \
-	futures/ManualExecutor.h \
 	futures/Promise-inl.h \
 	futures/Promise.h \
-	futures/QueuedImmediateExecutor.h \
-	futures/ScheduledExecutor.h \
 	futures/SharedPromise.h \
 	futures/SharedPromise-inl.h \
 	futures/ThreadWheelTimekeeper.h \
@@ -207,6 +225,9 @@ nobase_follyinclude_HEADERS = \
 	futures/detail/FSM.h \
 	futures/detail/Types.h \
 	futures/test/TestExecutor.h \
+	hash/Checksum.h \
+	hash/detail/ChecksumDetail.h \
+	hash/Hash.h \
 	hash/SpookyHashV1.h \
 	hash/SpookyHashV2.h \
 	gen/Base.h \
@@ -233,7 +254,6 @@ nobase_follyinclude_HEADERS = \
 	IndexedMemPool.h \
 	init/Init.h \
 	IntrusiveList.h \
-	io/Compression.h \
 	io/Cursor.h \
 	io/Cursor-inl.h \
 	io/IOBuf.h \
@@ -291,9 +311,9 @@ nobase_follyinclude_HEADERS = \
 	io/async/test/TimeUtil.h \
 	io/async/test/UndelayedDestruction.h \
 	io/async/test/Util.h \
-	Iterator.h \
 	json.h \
-	Launder.h \
+	lang/Assume.h \
+	lang/Launder.h \
 	Lazy.h \
 	LifoSem.h \
 	Likely.h \
@@ -301,13 +321,16 @@ nobase_follyinclude_HEADERS = \
 	LockTraitsBoost.h \
 	Logging.h \
 	MacAddress.h \
-	MallctlHelper.h \
-	Malloc.h \
 	MapUtil.h \
 	Math.h \
 	Memory.h \
-	MemoryMapping.h \
+	memory/Arena.h \
+	memory/Arena-inl.h \
+	memory/MallctlHelper.h \
+	memory/Malloc.h \
+	memory/ThreadCachedArena.h \
 	memory/UninitializedMemoryHacks.h \
+	memory/detail/MallocImpl.h \
 	MicroSpinLock.h \
 	MicroLock.h \
 	MoveWrapper.h \
@@ -317,7 +340,6 @@ nobase_follyinclude_HEADERS = \
 	Overload.h \
 	PackedSyncPtr.h \
 	Padded.h \
-	Partial.h \
 	PicoSpinLock.h \
 	Portability.h \
 	portability/Asm.h \
@@ -369,7 +391,6 @@ nobase_follyinclude_HEADERS = \
 	SafeAssert.h \
 	ScopeGuard.h \
 	SharedMutex.h \
-	Shell.h \
 	Singleton.h \
 	Singleton-inl.h \
 	SingletonThreadLocal.h \
@@ -377,7 +398,6 @@ nobase_follyinclude_HEADERS = \
 	small_vector.h \
 	SocketAddress.h \
 	sorted_vector_types.h \
-	SparseByteSet.h \
 	SpinLock.h \
 	ssl/Init.h \
 	ssl/OpenSSLCertUtils.h \
@@ -397,11 +417,19 @@ nobase_follyinclude_HEADERS = \
 	stats/MultiLevelTimeSeries.h \
 	stats/TimeseriesHistogram-defs.h \
 	stats/TimeseriesHistogram.h \
+	synchronization/CallOnce.h \
+	synchronization/detail/AtomicUtils.h \
+	system/MemoryMapping.h \
+	system/Shell.h \
+	system/ThreadId.h \
+	system/ThreadName.h \
+	system/VersionCheck.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 \
@@ -409,14 +437,12 @@ nobase_follyinclude_HEADERS = \
 	test/SynchronizedTestLib.h \
 	test/SynchronizedTestLib-inl.h \
 	test/TestUtils.h \
-	ThreadCachedArena.h \
 	ThreadCachedInt.h \
-	ThreadId.h \
 	ThreadLocal.h \
-	ThreadName.h \
 	TimeoutQueue.h \
 	TokenBucket.h \
 	tracing/StaticTracepoint.h \
+	tracing/ScopedTraceSection.h \
 	Traits.h \
 	Try-inl.h \
 	Try.h \
@@ -428,8 +454,7 @@ nobase_follyinclude_HEADERS = \
 	Uri.h \
 	Uri-inl.h \
 	Utility.h \
-	Varint.h \
-	VersionCheck.h
+	Varint.h
 
 FormatTables.cpp: build/generate_format_tables.py
 	$(PYTHON) build/generate_format_tables.py
@@ -444,9 +469,9 @@ GroupVarintTables.cpp: build/generate_varint_tables.py
 CLEANFILES += GroupVarintTables.cpp
 
 libfollybasesse42_la_SOURCES = \
-	detail/Crc32cDetail.cpp \
-	detail/ChecksumDetail.cpp \
-	detail/RangeSse42.cpp
+	detail/RangeSse42.cpp \
+	hash/detail/ChecksumDetail.cpp \
+	hash/detail/Crc32cDetail.cpp
 
 libfollybase_la_SOURCES = \
 	Conv.cpp \
@@ -456,17 +481,20 @@ libfollybase_la_SOURCES = \
 	Format.cpp \
 	FormatArg.cpp \
 	FormatTables.cpp \
-	MallctlHelper.cpp \
+	memory/MallctlHelper.cpp \
 	portability/BitsFunctexcept.cpp \
 	String.cpp \
 	Unicode.cpp
 
 libfolly_la_SOURCES = \
-	Assume.cpp \
-	Checksum.cpp \
 	ClockGettimeWrappers.cpp \
+	compression/Compression.cpp \
+	compression/Zlib.cpp \
 	concurrency/CacheLocality.cpp \
+	detail/Futex.cpp \
 	detail/IPAddress.cpp \
+	detail/StaticSingletonManager.cpp \
+	detail/ThreadLocalDetail.cpp \
 	dynamic.cpp \
 	ExceptionWrapper.cpp \
 	Executor.cpp \
@@ -476,23 +504,31 @@ libfolly_la_SOURCES = \
 	futures/Barrier.cpp \
 	futures/Future.cpp \
 	futures/FutureException.cpp \
-	futures/ManualExecutor.cpp \
-	futures/QueuedImmediateExecutor.cpp \
 	futures/ThreadWheelTimekeeper.cpp \
 	futures/test/TestExecutor.cpp \
-	detail/Futex.cpp \
-	detail/StaticSingletonManager.cpp \
-	detail/ThreadLocalDetail.cpp \
-	hash/SpookyHashV1.cpp \
-	hash/SpookyHashV2.cpp \
+	executors/CPUThreadPoolExecutor.cpp \
+	executors/Codel.cpp \
+	executors/GlobalExecutor.cpp \
+	executors/GlobalThreadPoolList.cpp \
+	executors/IOThreadPoolExecutor.cpp \
+	executors/InlineExecutor.cpp \
+	executors/ManualExecutor.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 \
 	LifoSem.cpp \
 	init/Init.cpp \
-	io/Compression.cpp \
 	io/Cursor.cpp \
 	io/IOBuf.cpp \
 	io/IOBufQueue.cpp \
@@ -504,6 +540,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 \
@@ -523,10 +560,11 @@ libfolly_la_SOURCES = \
 	io/async/ssl/OpenSSLUtils.cpp \
 	io/async/ssl/SSLErrors.cpp \
 	json.cpp \
+	lang/Assume.cpp \
 	detail/MemoryIdler.cpp \
 	detail/SocketFastOpen.cpp \
 	MacAddress.cpp \
-	MemoryMapping.cpp \
+	memory/ThreadCachedArena.cpp \
 	portability/Dirent.cpp \
 	portability/Fcntl.cpp \
 	portability/Libgen.cpp \
@@ -551,7 +589,6 @@ libfolly_la_SOURCES = \
 	SafeAssert.cpp \
 	ScopeGuard.cpp \
 	SharedMutex.cpp \
-	Shell.cpp \
 	MicroLock.cpp \
 	Optional.cpp \
 	Singleton.cpp \
@@ -565,13 +602,14 @@ libfolly_la_SOURCES = \
 	stats/Histogram.cpp \
 	stats/MultiLevelTimeSeries.cpp \
 	stats/TimeseriesHistogram.cpp \
+	system/MemoryMapping.cpp \
+	system/Shell.cpp \
+	system/ThreadName.cpp \
+	system/VersionCheck.cpp \
 	Subprocess.cpp \
-	ThreadCachedArena.cpp \
-	ThreadName.cpp \
 	TimeoutQueue.cpp \
 	Try.cpp \
 	Uri.cpp \
-	Version.cpp \
 	experimental/AsymmetricMemoryBarrier.cpp \
 	experimental/ThreadedRepeatingFunctionRunner.cpp \
 	experimental/bser/Dump.cpp \
@@ -597,7 +635,7 @@ libfolly_la_SOURCES += \
 endif
 
 if !HAVE_WEAK_SYMBOLS
-libfollybase_la_SOURCES += detail/MallocImpl.cpp
+libfollybase_la_SOURCES += memory/detail/MallocImpl.cpp
 endif
 
 if HAVE_BOOST_CONTEXT
@@ -647,6 +685,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