X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=212c0a170e677aac11e64b730de7b082bc9d5b32;hb=6c76acfc86177dd2570bf80411baa47dd2b74c72;hp=904d70a331783aa00e2b11708a613d290041b052;hpb=5ae81138c02ec6e14b34ab1f383acf70546abbb8;p=folly.git diff --git a/folly/Makefile.am b/folly/Makefile.am index 904d70a3..212c0a17 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -25,12 +25,14 @@ nobase_follyinclude_HEADERS = \ ApplyTuple.h \ Arena.h \ Arena-inl.h \ + Array.h \ Assume.h \ AtomicBitSet.h \ AtomicHashArray.h \ AtomicHashArray-inl.h \ AtomicHashMap.h \ AtomicHashMap-inl.h \ + AtomicIntrusiveLinkedList.h \ AtomicLinkedList.h \ AtomicStruct.h \ AtomicUnorderedMap.h \ @@ -53,7 +55,6 @@ nobase_follyinclude_HEADERS = \ detail/BitsDetail.h \ detail/CacheLocality.h \ detail/ChecksumDetail.h \ - detail/Clock.h \ detail/DiscriminatedPtrDetail.h \ detail/ExceptionWrapper.h \ detail/FileUtilDetail.h \ @@ -69,6 +70,7 @@ nobase_follyinclude_HEADERS = \ detail/RangeSse42.h \ detail/Sleeper.h \ detail/SlowFingerprint.h \ + detail/SocketFastOpen.h \ detail/SpinLockImpl.h \ detail/StaticSingletonManager.h \ detail/Stats.h \ @@ -81,43 +83,20 @@ nobase_follyinclude_HEADERS = \ dynamic.h \ dynamic-inl.h \ Exception.h \ + ExceptionString.h \ ExceptionWrapper.h \ Executor.h \ EvictingCacheMap.h \ experimental/AutoTimer.h \ experimental/Bits.h \ experimental/BitVectorCoding.h \ + experimental/DynamicParser.h \ + experimental/DynamicParser-inl.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 \ - experimental/fibers/Baton-inl.h \ - experimental/fibers/BoostContextCompatibility.h \ - experimental/fibers/EventBaseLoopController.h \ - experimental/fibers/EventBaseLoopController-inl.h \ - experimental/fibers/Fiber.h \ - experimental/fibers/Fiber-inl.h \ - experimental/fibers/FiberManager.h \ - experimental/fibers/FiberManager-inl.h \ - experimental/fibers/FiberManagerMap.h \ - experimental/fibers/ForEach.h \ - experimental/fibers/ForEach-inl.h \ - experimental/fibers/GenericBaton.h \ - experimental/fibers/GuardPageAllocator.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 \ - experimental/fibers/WhenN-inl.h \ experimental/FunctionScheduler.h \ experimental/FutureDAG.h \ experimental/io/FsUtil.h \ @@ -152,7 +131,6 @@ nobase_follyinclude_HEADERS = \ Format.h \ Format-inl.h \ futures/Barrier.h \ - futures/ThreadedExecutor.h \ futures/DrivableExecutor.h \ futures/Future-pre.h \ futures/helpers.h \ @@ -170,9 +148,6 @@ nobase_follyinclude_HEADERS = \ 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/Types.h \ @@ -202,6 +177,7 @@ nobase_follyinclude_HEADERS = \ IntrusiveList.h \ io/Compression.h \ io/Cursor.h \ + io/Cursor-inl.h \ io/IOBuf.h \ io/IOBufQueue.h \ io/RecordIO.h \ @@ -231,6 +207,7 @@ nobase_follyinclude_HEADERS = \ io/async/HHWheelTimer.h \ io/async/ssl/OpenSSLPtrTypes.h \ io/async/ssl/OpenSSLUtils.h \ + io/async/ssl/SSLErrors.h \ io/async/ssl/TLSDefinitions.h \ io/async/Request.h \ io/async/SSLContext.h \ @@ -268,18 +245,37 @@ nobase_follyinclude_HEADERS = \ Padded.h \ PicoSpinLock.h \ Portability.h \ + portability/Asm.h \ + portability/Builtins.h \ + portability/Config.h \ portability/Constexpr.h \ + portability/Dirent.h \ portability/Environment.h \ + portability/Event.h \ + portability/Fcntl.h \ portability/GFlags.h \ + portability/IOVec.h \ + portability/Libgen.h \ + portability/Malloc.h \ + portability/Math.h \ portability/Memory.h \ - portability/Strings.h \ - portability/Syscall.h \ + portability/PThread.h \ + portability/Sockets.h \ + portability/Stdio.h \ + portability/Stdlib.h \ + portability/String.h \ + portability/Syslog.h \ + portability/SysFile.h \ + portability/SysMman.h \ + portability/SysResource.h \ portability/SysStat.h \ + portability/SysSyscall.h \ portability/SysTime.h \ portability/SysTypes.h \ portability/SysUio.h \ portability/Time.h \ portability/Windows.h \ + portability/Unistd.h \ Preprocessor.h \ ProducerConsumerQueue.h \ Random.h \ @@ -299,6 +295,7 @@ nobase_follyinclude_HEADERS = \ SpinLock.h \ SpookyHashV1.h \ SpookyHashV2.h \ + ssl/OpenSSLHash.h \ stats/BucketedTimeSeries-defs.h \ stats/BucketedTimeSeries.h \ stats/Histogram-defs.h \ @@ -324,7 +321,11 @@ nobase_follyinclude_HEADERS = \ ThreadName.h \ TimeoutQueue.h \ Traits.h \ + Try-inl.h \ + Try.h \ Unicode.h \ + Function.h \ + Unit.h \ Uri.h \ Uri-inl.h \ Varint.h \ @@ -363,7 +364,6 @@ libfolly_la_SOURCES = \ FileUtil.cpp \ FingerprintTables.cpp \ futures/Barrier.cpp \ - futures/ThreadedExecutor.cpp \ futures/Future.cpp \ futures/InlineExecutor.cpp \ futures/ManualExecutor.cpp \ @@ -379,6 +379,7 @@ libfolly_la_SOURCES = \ IPAddressV6.cpp \ LifoSem.cpp \ io/Compression.cpp \ + io/Cursor.cpp \ io/IOBuf.cpp \ io/IOBufQueue.cpp \ io/RecordIO.cpp \ @@ -401,15 +402,30 @@ libfolly_la_SOURCES = \ io/async/test/SocketPair.cpp \ io/async/test/TimeUtil.cpp \ io/async/ssl/OpenSSLUtils.cpp \ + io/async/ssl/SSLErrors.cpp \ json.cpp \ detail/MemoryIdler.cpp \ + detail/SocketFastOpen.cpp \ MacAddress.cpp \ MemoryMapping.cpp \ + portability/Dirent.cpp \ portability/Environment.cpp \ - portability/Strings.cpp \ + portability/Fcntl.cpp \ + portability/Libgen.cpp \ + portability/Malloc.cpp \ + portability/Memory.cpp \ + portability/Sockets.cpp \ + portability/Stdio.cpp \ + portability/Stdlib.cpp \ + portability/String.cpp \ + portability/SysFile.cpp \ + portability/SysMman.cpp \ + portability/SysResource.cpp \ portability/SysStat.cpp \ portability/SysTime.cpp \ + portability/SysUio.cpp \ portability/Time.cpp \ + portability/Unistd.cpp \ Random.cpp \ SafeAssert.cpp \ SharedMutex.cpp \ @@ -418,6 +434,7 @@ libfolly_la_SOURCES = \ SocketAddress.cpp \ SpookyHashV1.cpp \ SpookyHashV2.cpp \ + ssl/OpenSSLHash.cpp \ stats/Instantiations.cpp \ Subprocess.cpp \ ThreadCachedArena.cpp \ @@ -426,12 +443,7 @@ libfolly_la_SOURCES = \ 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/DynamicParser.cpp \ experimental/FunctionScheduler.cpp \ experimental/io/FsUtil.cpp \ experimental/JSONSchema.cpp \ @@ -447,18 +459,52 @@ libfolly_la_SOURCES += \ experimental/io/HugePages.cpp endif -if !HAVE_LINUX -libfollybase_la_SOURCES += detail/Clock.cpp -endif - if !HAVE_WEAK_SYMBOLS libfollybase_la_SOURCES += detail/MallocImpl.cpp endif -if !HAVE_BITS_FUNCTEXCEPT +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/Baton.h \ + fibers/Baton-inl.h \ + fibers/BoostContextCompatibility.h \ + fibers/EventBaseLoopController.h \ + fibers/EventBaseLoopController-inl.h \ + fibers/Fiber.h \ + fibers/Fiber-inl.h \ + fibers/FiberManager.h \ + fibers/FiberManager-inl.h \ + fibers/FiberManagerMap.h \ + fibers/ForEach.h \ + fibers/ForEach-inl.h \ + fibers/GenericBaton.h \ + fibers/GuardPageAllocator.h \ + fibers/LoopController.h \ + fibers/Promise.h \ + fibers/Promise-inl.h \ + fibers/SimpleLoopController.h \ + fibers/TimedMutex.h \ + fibers/TimedMutex-inl.h \ + fibers/TimeoutController.h \ + fibers/traits.h \ + fibers/WhenN.h \ + fibers/WhenN-inl.h + +libfolly_la_SOURCES += \ + fibers/Baton.cpp \ + fibers/Fiber.cpp \ + fibers/FiberManager.cpp \ + fibers/FiberManagerMap.cpp \ + fibers/GuardPageAllocator.cpp \ + fibers/TimeoutController.cpp +endif + libfollybase_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) libfolly_la_LIBADD = libfollybase.la