X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=3d5fd9ba5816c27af5a3a18f6445d07fe098fc52;hb=507086879c31e0918c94e96fc696fac2501cc001;hp=d1cdf4bd00d31f6968d3c3710f6e1ece0d1603d1;hpb=5bebf3c9ea5276ce8a099bcce9a3dfa9c6727bb8;p=folly.git

diff --git a/folly/Makefile.am b/folly/Makefile.am
index d1cdf4bd..3d5fd9ba 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -1,18 +1,25 @@
 if FOLLY_TESTMAIN
-SUBDIRS = . experimental init test
-else
-SUBDIRS = . test
+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)
+
 ACLOCAL_AMFLAGS = -I m4
 
 CLEANFILES =
 
+
 noinst_PROGRAMS = generate_fingerprint_tables
 generate_fingerprint_tables_SOURCES = build/GenerateFingerprintTables.cpp
 generate_fingerprint_tables_LDADD = libfollybase.la
 
 noinst_LTLIBRARIES = \
+	libfollybasesse42.la \
 	libfollybase.la
 
 lib_LTLIBRARIES = \
@@ -42,6 +49,7 @@ nobase_follyinclude_HEADERS = \
 	CachelinePadded.h \
 	CallOnce.h \
 	Checksum.h \
+	Chrono.h \
 	ClockGettimeWrappers.h \
 	ConcurrentSkipList.h \
 	ConcurrentSkipList-inl.h \
@@ -52,13 +60,13 @@ nobase_follyinclude_HEADERS = \
 	CPortability.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/ExceptionWrapper.h \
 	detail/FileUtilDetail.h \
 	detail/FingerprintPolynomial.h \
 	detail/Futex.h \
@@ -73,10 +81,10 @@ nobase_follyinclude_HEADERS = \
 	detail/Sleeper.h \
 	detail/SlowFingerprint.h \
 	detail/SocketFastOpen.h \
-	detail/SpinLockImpl.h \
 	detail/StaticSingletonManager.h \
 	detail/Stats.h \
 	detail/ThreadLocalDetail.h \
+	detail/TryDetail.h \
 	detail/TurnSequencer.h \
 	detail/UncaughtExceptionCounter.h \
 	Demangle.h \
@@ -89,9 +97,12 @@ nobase_follyinclude_HEADERS = \
 	Exception.h \
 	ExceptionString.h \
 	ExceptionWrapper.h \
+	ExceptionWrapper-inl.h \
 	Executor.h \
 	Expected.h \
 	experimental/AsymmetricMemoryBarrier.h \
+	experimental/AtomicSharedPtr.h \
+	experimental/detail/AtomicSharedPtr-detail.h \
 	experimental/AutoTimer.h \
 	experimental/Bits.h \
 	experimental/BitVectorCoding.h \
@@ -99,12 +110,19 @@ nobase_follyinclude_HEADERS = \
 	experimental/DynamicParser-inl.h \
 	experimental/ExecutionObserver.h \
 	experimental/EliasFanoCoding.h \
+	experimental/EnvUtil.h \
 	experimental/EventCount.h \
 	experimental/Instructions.h \
 	experimental/bser/Bser.h \
+	experimental/exception_tracer/ExceptionAbi.h \
+	experimental/exception_tracer/ExceptionCounterLib.h \
+	experimental/exception_tracer/ExceptionTracer.h \
+	experimental/exception_tracer/ExceptionTracerLib.h \
+	experimental/exception_tracer/StackTrace.h \
 	experimental/FunctionScheduler.h \
 	experimental/FutureDAG.h \
 	experimental/io/FsUtil.h \
+	experimental/JemallocNodumpAllocator.h \
 	experimental/JSONSchema.h \
 	experimental/LockFreeRingBuffer.h \
 	experimental/NestedCommandLineApp.h \
@@ -121,14 +139,17 @@ nobase_follyinclude_HEADERS = \
 	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.cpp \
+	experimental/symbolizer/StackTrace.h \
 	experimental/symbolizer/Symbolizer.h \
 	experimental/Select64.h \
 	experimental/StringKeyedCommon.h \
+	experimental/StringKeyedMap.h \
+	experimental/StringKeyedSet.h \
 	experimental/StringKeyedUnorderedMap.h \
 	experimental/StringKeyedUnorderedSet.h \
 	experimental/TestUtil.h \
@@ -139,6 +160,7 @@ nobase_follyinclude_HEADERS = \
 	File.h \
 	FileUtil.h \
 	Fingerprint.h \
+	FixedString.h \
 	folly-config.h \
 	Foreach.h \
 	FormatArg.h \
@@ -152,6 +174,7 @@ nobase_follyinclude_HEADERS = \
 	futures/Future.h \
 	futures/Future-inl.h \
 	futures/FutureException.h \
+	futures/FutureSplitter.h \
 	futures/InlineExecutor.h \
 	futures/ManualExecutor.h \
 	futures/OpaqueCallbackShunt.h \
@@ -166,6 +189,7 @@ nobase_follyinclude_HEADERS = \
 	futures/detail/Core.h \
 	futures/detail/FSM.h \
 	futures/detail/Types.h \
+	futures/test/TestExecutor.h \
 	gen/Base.h \
 	gen/Base-inl.h \
 	gen/Combine.h \
@@ -216,6 +240,7 @@ nobase_follyinclude_HEADERS = \
 	io/async/EventBase.h \
 	io/async/EventBaseLocal.h \
 	io/async/EventBaseManager.h \
+	io/async/EventBaseThread.h \
 	io/async/EventFDWrapper.h \
 	io/async/EventHandler.h \
 	io/async/EventUtil.h \
@@ -229,8 +254,10 @@ nobase_follyinclude_HEADERS = \
 	io/async/SSLContext.h \
 	io/async/ScopedEventBaseThread.h \
 	io/async/TimeoutManager.h \
+	io/async/VirtualEventBase.h \
 	io/async/WriteChainAsyncTransportWrapper.h \
 	io/async/test/AsyncSSLSocketTest.h \
+	io/async/test/AsyncSocketTest2.h \
 	io/async/test/BlockingSocket.h \
 	io/async/test/MockAsyncSocket.h \
 	io/async/test/MockAsyncServerSocket.h \
@@ -240,6 +267,7 @@ nobase_follyinclude_HEADERS = \
 	io/async/test/MockTimeoutManager.h \
 	io/async/test/ScopedBoundPort.h \
 	io/async/test/SocketPair.h \
+	io/async/test/TestSSLServer.h \
 	io/async/test/TimeUtil.h \
 	io/async/test/UndelayedDestruction.h \
 	io/async/test/Util.h \
@@ -275,7 +303,6 @@ nobase_follyinclude_HEADERS = \
 	portability/Config.h \
 	portability/Constexpr.h \
 	portability/Dirent.h \
-	portability/Environment.h \
 	portability/Event.h \
 	portability/Fcntl.h \
 	portability/GFlags.h \
@@ -286,6 +313,7 @@ nobase_follyinclude_HEADERS = \
 	portability/Malloc.h \
 	portability/Math.h \
 	portability/Memory.h \
+	portability/OpenSSL.h \
 	portability/PThread.h \
 	portability/Sockets.h \
 	portability/Stdio.h \
@@ -306,11 +334,13 @@ nobase_follyinclude_HEADERS = \
 	portability/Windows.h \
 	portability/Unistd.h \
 	Preprocessor.h \
+	PriorityMPMCQueue.h \
 	ProducerConsumerQueue.h \
 	Random.h \
 	Random-inl.h \
 	Range.h \
 	RWSpinLock.h \
+	SafeAssert.h \
 	ScopeGuard.h \
 	SharedMutex.h \
 	Shell.h \
@@ -325,7 +355,11 @@ nobase_follyinclude_HEADERS = \
 	SpinLock.h \
 	SpookyHashV1.h \
 	SpookyHashV2.h \
+	ssl/OpenSSLCertUtils.h \
 	ssl/OpenSSLHash.h \
+	ssl/OpenSSLVersionFinder.h \
+	ssl/SSLSession.h \
+	ssl/detail/SSLSessionImpl.h \
 	stats/BucketedTimeSeries-defs.h \
 	stats/BucketedTimeSeries.h \
 	stats/Histogram-defs.h \
@@ -348,18 +382,22 @@ nobase_follyinclude_HEADERS = \
 	test/TestUtils.h \
 	ThreadCachedArena.h \
 	ThreadCachedInt.h \
+	ThreadId.h \
 	ThreadLocal.h \
 	ThreadName.h \
 	TimeoutQueue.h \
 	TokenBucket.h \
+	tracing/StaticTracepoint.h \
 	Traits.h \
 	Try-inl.h \
 	Try.h \
 	Unicode.h \
 	Function.h \
+	UncaughtExceptions.h \
 	Unit.h \
 	Uri.h \
 	Uri-inl.h \
+	Utility.h \
 	Varint.h \
 	VersionCheck.h
 
@@ -375,15 +413,18 @@ GroupVarintTables.cpp: build/generate_varint_tables.py
 	$(PYTHON) build/generate_varint_tables.py
 CLEANFILES += GroupVarintTables.cpp
 
+libfollybasesse42_la_SOURCES = \
+	detail/RangeSse42.cpp
+
 libfollybase_la_SOURCES = \
 	Conv.cpp \
 	Demangle.cpp \
 	detail/RangeCommon.cpp \
-	detail/RangeSse42.cpp \
 	EscapeTables.cpp \
 	Format.cpp \
 	FormatTables.cpp \
 	MallctlHelper.cpp \
+	portability/BitsFunctexcept.cpp \
 	StringBase.cpp \
 	String.cpp \
 	Unicode.cpp
@@ -396,6 +437,8 @@ libfolly_la_SOURCES = \
 	detail/CacheLocality.cpp \
 	detail/IPAddress.cpp \
 	dynamic.cpp \
+	ExceptionWrapper.cpp \
+	Executor.cpp \
 	File.cpp \
 	FileUtil.cpp \
 	FingerprintTables.cpp \
@@ -405,6 +448,7 @@ libfolly_la_SOURCES = \
 	futures/ManualExecutor.cpp \
 	futures/QueuedImmediateExecutor.cpp \
 	futures/ThreadWheelTimekeeper.cpp \
+	futures/test/TestExecutor.cpp \
 	detail/Futex.cpp \
 	detail/StaticSingletonManager.cpp \
 	detail/ThreadLocalDetail.cpp \
@@ -414,6 +458,7 @@ libfolly_la_SOURCES = \
 	IPAddressV4.cpp \
 	IPAddressV6.cpp \
 	LifoSem.cpp \
+	init/Init.cpp \
 	io/Compression.cpp \
 	io/Cursor.cpp \
 	io/IOBuf.cpp \
@@ -430,11 +475,14 @@ libfolly_la_SOURCES = \
 	io/async/EventBase.cpp \
 	io/async/EventBaseLocal.cpp \
 	io/async/EventBaseManager.cpp \
+	io/async/EventBaseThread.cpp \
 	io/async/EventHandler.cpp \
 	io/async/Request.cpp \
 	io/async/SSLContext.cpp \
 	io/async/ScopedEventBaseThread.cpp \
+	io/async/VirtualEventBase.cpp \
 	io/async/HHWheelTimer.cpp \
+	io/async/TimeoutManager.cpp \
 	io/async/test/ScopedBoundPort.cpp \
 	io/async/test/SocketPair.cpp \
 	io/async/test/TimeUtil.cpp \
@@ -445,13 +493,13 @@ libfolly_la_SOURCES = \
 	detail/SocketFastOpen.cpp \
 	MacAddress.cpp \
 	MemoryMapping.cpp \
-	portability/BitsFunctexcept.cpp \
 	portability/Dirent.cpp \
-	portability/Environment.cpp \
 	portability/Fcntl.cpp \
 	portability/Libgen.cpp \
 	portability/Malloc.cpp \
 	portability/Memory.cpp \
+	portability/OpenSSL.cpp \
+	portability/PThread.cpp \
 	portability/Sockets.cpp \
 	portability/Stdio.cpp \
 	portability/Stdlib.cpp \
@@ -467,6 +515,7 @@ libfolly_la_SOURCES = \
 	portability/Unistd.cpp \
 	Random.cpp \
 	SafeAssert.cpp \
+	ScopeGuard.cpp \
 	SharedMutex.cpp \
 	Shell.cpp \
 	MicroLock.cpp \
@@ -474,7 +523,9 @@ libfolly_la_SOURCES = \
 	SocketAddress.cpp \
 	SpookyHashV1.cpp \
 	SpookyHashV2.cpp \
+	ssl/OpenSSLCertUtils.cpp \
 	ssl/OpenSSLHash.cpp \
+	ssl/detail/SSLSessionImpl.cpp \
 	stats/Instantiations.cpp \
 	Subprocess.cpp \
 	ThreadCachedArena.cpp \
@@ -485,8 +536,10 @@ libfolly_la_SOURCES = \
 	experimental/bser/Dump.cpp \
 	experimental/bser/Load.cpp \
 	experimental/DynamicParser.cpp \
+	experimental/EnvUtil.cpp \
 	experimental/FunctionScheduler.cpp \
 	experimental/io/FsUtil.cpp \
+	experimental/JemallocNodumpAllocator.cpp \
 	experimental/JSONSchema.cpp \
 	experimental/NestedCommandLineApp.cpp \
 	experimental/observer/detail/Core.cpp \
@@ -510,9 +563,13 @@ if HAVE_BOOST_CONTEXT
 nobase_follyinclude_HEADERS += \
 	fibers/AddTasks.h \
 	fibers/AddTasks-inl.h \
+	fibers/AtomicBatchDispatcher.h \
+	fibers/AtomicBatchDispatcher-inl.h \
 	fibers/Baton.h \
 	fibers/Baton-inl.h \
+	fibers/BatchDispatcher.h \
 	fibers/BoostContextCompatibility.h \
+	fibers/detail/AtomicBatchDispatcher.h \
 	fibers/EventBaseLoopController.h \
 	fibers/EventBaseLoopController-inl.h \
 	fibers/Fiber.h \
@@ -540,6 +597,7 @@ nobase_follyinclude_HEADERS += \
 
 libfolly_la_SOURCES += \
 	fibers/Baton.cpp \
+	fibers/detail/AtomicBatchDispatcher.cpp \
 	fibers/Fiber.cpp \
 	fibers/FiberManager.cpp \
 	fibers/FiberManagerMap.cpp \
@@ -548,6 +606,10 @@ libfolly_la_SOURCES += \
 	fibers/TimeoutController.cpp
 endif
 
+libfollybasesse42_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
+libfollybasesse42_la_CXXFLAGS = -msse4.2
+
+libfollybase_la_LIBADD = libfollybasesse42.la
 libfollybase_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
 
 libfolly_la_LIBADD = libfollybase.la