X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=52cb69fa339c9169dbcfe53e446412fe704fe5c3;hb=03a4c5bd8fc60ce0bed9531fcd88b06c06cb27cc;hp=381bd1bb809af572b6c51dae7113e19edb15e81d;hpb=d2549d035ac7b7f333f1e349ba20f3ebe8bd4609;p=folly.git diff --git a/folly/Makefile.am b/folly/Makefile.am index 381bd1bb..52cb69fa 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -13,6 +13,7 @@ generate_fingerprint_tables_SOURCES = build/GenerateFingerprintTables.cpp generate_fingerprint_tables_LDADD = libfollybase.la noinst_LTLIBRARIES = \ + libfollybasesse42.la \ libfollybase.la lib_LTLIBRARIES = \ @@ -39,11 +40,12 @@ nobase_follyinclude_HEADERS = \ Baton.h \ Benchmark.h \ Bits.h \ + CachelinePadded.h \ CallOnce.h \ Checksum.h \ + ClockGettimeWrappers.h \ ConcurrentSkipList.h \ ConcurrentSkipList-inl.h \ - ConditionallyExistent.h \ ContainerTraits.h \ Conv.h \ CppAttributes.h \ @@ -54,15 +56,15 @@ nobase_follyinclude_HEADERS = \ 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/FunctionalExcept.h \ detail/Futex.h \ detail/GroupVarintDetail.h \ detail/IPAddress.h \ + detail/IPAddressSource.h \ detail/Malloc.h \ detail/MemoryIdler.h \ detail/MPMCPipelineDetail.h \ @@ -75,6 +77,7 @@ nobase_follyinclude_HEADERS = \ detail/StaticSingletonManager.h \ detail/Stats.h \ detail/ThreadLocalDetail.h \ + detail/TryDetail.h \ detail/TurnSequencer.h \ detail/UncaughtExceptionCounter.h \ Demangle.h \ @@ -83,11 +86,13 @@ nobase_follyinclude_HEADERS = \ dynamic.h \ dynamic-inl.h \ Enumerate.h \ + EvictingCacheMap.h \ Exception.h \ ExceptionString.h \ ExceptionWrapper.h \ Executor.h \ - EvictingCacheMap.h \ + Expected.h \ + experimental/AsymmetricMemoryBarrier.h \ experimental/AutoTimer.h \ experimental/Bits.h \ experimental/BitVectorCoding.h \ @@ -101,20 +106,34 @@ nobase_follyinclude_HEADERS = \ experimental/FunctionScheduler.h \ experimental/FutureDAG.h \ experimental/io/FsUtil.h \ + experimental/JemallocNodumpAllocator.h \ experimental/JSONSchema.h \ experimental/LockFreeRingBuffer.h \ experimental/NestedCommandLineApp.h \ + experimental/observer/detail/Core.h \ + experimental/observer/detail/GraphCycleDetector.h \ + experimental/observer/detail/ObserverManager.h \ + experimental/observer/detail/Observer-pre.h \ + experimental/observer/Observable.h \ + experimental/observer/Observable-inl.h \ + experimental/observer/Observer.h \ + experimental/observer/Observer-inl.h \ + experimental/observer/SimpleObservable.h \ + 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.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 \ @@ -125,6 +144,7 @@ nobase_follyinclude_HEADERS = \ File.h \ FileUtil.h \ Fingerprint.h \ + FixedString.h \ folly-config.h \ Foreach.h \ FormatArg.h \ @@ -196,11 +216,13 @@ nobase_follyinclude_HEADERS = \ io/async/AsyncSocketBase.h \ io/async/AsyncSSLSocket.h \ io/async/AsyncSocketException.h \ + io/async/DecoratedAsyncTransportWrapper.h \ io/async/DelayedDestructionBase.h \ io/async/DelayedDestruction.h \ 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 \ @@ -214,6 +236,8 @@ 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/BlockingSocket.h \ io/async/test/MockAsyncSocket.h \ @@ -222,6 +246,7 @@ nobase_follyinclude_HEADERS = \ io/async/test/MockAsyncTransport.h \ io/async/test/MockAsyncUDPSocket.h \ io/async/test/MockTimeoutManager.h \ + io/async/test/ScopedBoundPort.h \ io/async/test/SocketPair.h \ io/async/test/TimeUtil.h \ io/async/test/UndelayedDestruction.h \ @@ -234,8 +259,10 @@ nobase_follyinclude_HEADERS = \ LockTraitsBoost.h \ Logging.h \ MacAddress.h \ + MallctlHelper.h \ Malloc.h \ MapUtil.h \ + Math.h \ Memory.h \ MemoryMapping.h \ MicroSpinLock.h \ @@ -246,9 +273,12 @@ nobase_follyinclude_HEADERS = \ Optional.h \ PackedSyncPtr.h \ Padded.h \ + Partial.h \ PicoSpinLock.h \ Portability.h \ portability/Asm.h \ + portability/Atomic.h \ + portability/BitsFunctexcept.h \ portability/Builtins.h \ portability/Config.h \ portability/Constexpr.h \ @@ -257,11 +287,14 @@ nobase_follyinclude_HEADERS = \ portability/Event.h \ portability/Fcntl.h \ portability/GFlags.h \ + portability/GMock.h \ + portability/GTest.h \ portability/IOVec.h \ portability/Libgen.h \ portability/Malloc.h \ portability/Math.h \ portability/Memory.h \ + portability/OpenSSL.h \ portability/PThread.h \ portability/Sockets.h \ portability/Stdio.h \ @@ -269,6 +302,7 @@ nobase_follyinclude_HEADERS = \ portability/String.h \ portability/Syslog.h \ portability/SysFile.h \ + portability/SysMembarrier.h \ portability/SysMman.h \ portability/SysResource.h \ portability/SysStat.h \ @@ -277,6 +311,7 @@ nobase_follyinclude_HEADERS = \ portability/SysTypes.h \ portability/SysUio.h \ portability/Time.h \ + portability/TypeTraits.h \ portability/Windows.h \ portability/Unistd.h \ Preprocessor.h \ @@ -285,8 +320,10 @@ nobase_follyinclude_HEADERS = \ Random-inl.h \ Range.h \ RWSpinLock.h \ + SafeAssert.h \ ScopeGuard.h \ SharedMutex.h \ + Shell.h \ Singleton.h \ Singleton-inl.h \ SingletonThreadLocal.h \ @@ -299,6 +336,9 @@ nobase_follyinclude_HEADERS = \ SpookyHashV1.h \ SpookyHashV2.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 \ @@ -321,17 +361,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 @@ -347,23 +392,32 @@ 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 libfolly_la_SOURCES = \ + Assume.cpp \ Bits.cpp \ Checksum.cpp \ + ClockGettimeWrappers.cpp \ detail/CacheLocality.cpp \ + detail/IPAddress.cpp \ dynamic.cpp \ + ExceptionWrapper.cpp \ + Executor.cpp \ File.cpp \ FileUtil.cpp \ FingerprintTables.cpp \ @@ -382,6 +436,7 @@ libfolly_la_SOURCES = \ IPAddressV4.cpp \ IPAddressV6.cpp \ LifoSem.cpp \ + init/Init.cpp \ io/Compression.cpp \ io/Cursor.cpp \ io/IOBuf.cpp \ @@ -398,11 +453,15 @@ 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 \ io/async/ssl/OpenSSLUtils.cpp \ @@ -418,11 +477,13 @@ libfolly_la_SOURCES = \ portability/Libgen.cpp \ portability/Malloc.cpp \ portability/Memory.cpp \ + portability/OpenSSL.cpp \ portability/Sockets.cpp \ portability/Stdio.cpp \ portability/Stdlib.cpp \ portability/String.cpp \ portability/SysFile.cpp \ + portability/SysMembarrier.cpp \ portability/SysMman.cpp \ portability/SysResource.cpp \ portability/SysStat.cpp \ @@ -432,26 +493,33 @@ libfolly_la_SOURCES = \ portability/Unistd.cpp \ Random.cpp \ SafeAssert.cpp \ + ScopeGuard.cpp \ SharedMutex.cpp \ + Shell.cpp \ MicroLock.cpp \ Singleton.cpp \ SocketAddress.cpp \ SpookyHashV1.cpp \ SpookyHashV2.cpp \ ssl/OpenSSLHash.cpp \ + ssl/detail/SSLSessionImpl.cpp \ stats/Instantiations.cpp \ Subprocess.cpp \ ThreadCachedArena.cpp \ TimeoutQueue.cpp \ Uri.cpp \ Version.cpp \ + experimental/AsymmetricMemoryBarrier.cpp \ experimental/bser/Dump.cpp \ experimental/bser/Load.cpp \ experimental/DynamicParser.cpp \ experimental/FunctionScheduler.cpp \ experimental/io/FsUtil.cpp \ + experimental/JemallocNodumpAllocator.cpp \ experimental/JSONSchema.cpp \ experimental/NestedCommandLineApp.cpp \ + experimental/observer/detail/Core.cpp \ + experimental/observer/detail/ObserverManager.cpp \ experimental/ProgramOptions.cpp \ experimental/Select64.cpp \ experimental/TestUtil.cpp @@ -467,16 +535,15 @@ if !HAVE_WEAK_SYMBOLS libfollybase_la_SOURCES += detail/MallocImpl.cpp endif -if !HAVE_BITS_FUNCTEXCEPT_H -libfollybase_la_SOURCES += detail/FunctionalExcept.cpp -endif - 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/EventBaseLoopController.h \ fibers/EventBaseLoopController-inl.h \ @@ -484,6 +551,8 @@ nobase_follyinclude_HEADERS += \ fibers/Fiber-inl.h \ fibers/FiberManager.h \ fibers/FiberManager-inl.h \ + fibers/FiberManagerInternal.h \ + fibers/FiberManagerInternal-inl.h \ fibers/FiberManagerMap.h \ fibers/ForEach.h \ fibers/ForEach-inl.h \ @@ -492,6 +561,7 @@ nobase_follyinclude_HEADERS += \ fibers/LoopController.h \ fibers/Promise.h \ fibers/Promise-inl.h \ + fibers/Semaphore.h \ fibers/SimpleLoopController.h \ fibers/TimedMutex.h \ fibers/TimedMutex-inl.h \ @@ -506,9 +576,14 @@ libfolly_la_SOURCES += \ fibers/FiberManager.cpp \ fibers/FiberManagerMap.cpp \ fibers/GuardPageAllocator.cpp \ + fibers/Semaphore.cpp \ 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 @@ -521,3 +596,7 @@ CLEANFILES += FingerprintTables.cpp libfollybenchmark_la_SOURCES = Benchmark.cpp libfollybenchmark_la_LIBADD = libfolly.la libfollybenchmark_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) + +# install pkg-config metadata file +pkgconfigdir = $(libdir)/pkgconfig +nodist_pkgconfig_DATA = libfolly.pc