projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
folly: fix make_optional compliation issue with gnu++17
[folly.git]
/
folly
/
Makefile.am
diff --git
a/folly/Makefile.am
b/folly/Makefile.am
index dafdd730431ec21d6abd08dd6d17d7c6941b0612..3eb105ece370984df77b3cd49d17e4321ae5030d 100644
(file)
--- a/
folly/Makefile.am
+++ b/
folly/Makefile.am
@@
-5,7
+5,7
@@
endif
# Note that the order of SUBDIRS matters.
# Many subdirectories depend on libfollytest from the test directory,
# so it must appear before other directories
# 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
+SUBDIRS = . test experimental $(MAYBE_INIT)
chrono/test
io/test stats/test
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
@@
-27,8
+27,6
@@
lib_LTLIBRARIES = \
follyincludedir = $(includedir)/folly
nobase_follyinclude_HEADERS = \
follyincludedir = $(includedir)/folly
nobase_follyinclude_HEADERS = \
- Array.h \
- Assume.h \
AtomicBitSet.h \
AtomicHashArray.h \
AtomicHashArray-inl.h \
AtomicBitSet.h \
AtomicHashArray.h \
AtomicHashArray-inl.h \
@@
-36,28
+34,31
@@
nobase_follyinclude_HEADERS = \
AtomicHashMap-inl.h \
AtomicIntrusiveLinkedList.h \
AtomicLinkedList.h \
AtomicHashMap-inl.h \
AtomicIntrusiveLinkedList.h \
AtomicLinkedList.h \
- AtomicStruct.h \
AtomicUnorderedMap.h \
AtomicUnorderedMap.h \
- Baton.h \
Benchmark.h \
Bits.h \
CachelinePadded.h \
Chrono.h \
Benchmark.h \
Bits.h \
CachelinePadded.h \
Chrono.h \
+ chrono/Conv.h \
ClockGettimeWrappers.h \
ConcurrentSkipList.h \
ConcurrentSkipList-inl.h \
ClockGettimeWrappers.h \
ConcurrentSkipList.h \
ConcurrentSkipList-inl.h \
- ContainerTraits.h \
Conv.h \
CppAttributes.h \
CpuId.h \
CPortability.h \
compression/Compression.h \
Conv.h \
CppAttributes.h \
CpuId.h \
CPortability.h \
compression/Compression.h \
+ compression/Counters.h \
compression/Utils.h \
compression/Zlib.h \
concurrency/CacheLocality.h \
concurrency/ConcurrentHashMap.h \
concurrency/CoreCachedSharedPtr.h \
concurrency/detail/ConcurrentHashMap-detail.h \
compression/Utils.h \
compression/Zlib.h \
concurrency/CacheLocality.h \
concurrency/ConcurrentHashMap.h \
concurrency/CoreCachedSharedPtr.h \
concurrency/detail/ConcurrentHashMap-detail.h \
+ concurrency/UnboundedQueue.h \
+ container/Access.h \
+ container/Array.h \
+ container/detail/BitIteratorDetail.h \
container/Iterator.h \
container/Enumerate.h \
container/EvictingCacheMap.h \
container/Iterator.h \
container/Enumerate.h \
container/EvictingCacheMap.h \
@@
-65,9
+66,9
@@
nobase_follyinclude_HEADERS = \
container/Foreach-inl.h \
container/SparseByteSet.h \
ConstexprMath.h \
container/Foreach-inl.h \
container/SparseByteSet.h \
ConstexprMath.h \
+ detail/AtFork.h \
detail/AtomicHashUtils.h \
detail/AtomicUnorderedMapUtils.h \
detail/AtomicHashUtils.h \
detail/AtomicUnorderedMapUtils.h \
- detail/BitIteratorDetail.h \
detail/DiscriminatedPtrDetail.h \
detail/FileUtilDetail.h \
detail/FingerprintPolynomial.h \
detail/DiscriminatedPtrDetail.h \
detail/FileUtilDetail.h \
detail/FingerprintPolynomial.h \
@@
-77,15
+78,15
@@
nobase_follyinclude_HEADERS = \
detail/IPAddressSource.h \
detail/MemoryIdler.h \
detail/MPMCPipelineDetail.h \
detail/IPAddressSource.h \
detail/MemoryIdler.h \
detail/MPMCPipelineDetail.h \
+ detail/PolyDetail.h \
detail/RangeCommon.h \
detail/RangeSse42.h \
detail/RangeCommon.h \
detail/RangeSse42.h \
- detail/Sleeper.h \
detail/SlowFingerprint.h \
detail/SocketFastOpen.h \
detail/StaticSingletonManager.h \
detail/ThreadLocalDetail.h \
detail/SlowFingerprint.h \
detail/SocketFastOpen.h \
detail/StaticSingletonManager.h \
detail/ThreadLocalDetail.h \
+ detail/TypeList.h \
detail/TurnSequencer.h \
detail/TurnSequencer.h \
- detail/UncaughtExceptionCounter.h \
executors/Async.h \
executors/CPUThreadPoolExecutor.h \
executors/Codel.h \
executors/Async.h \
executors/CPUThreadPoolExecutor.h \
executors/Codel.h \
@@
-103,6
+104,7
@@
nobase_follyinclude_HEADERS = \
executors/SerialExecutor.h \
executors/ThreadPoolExecutor.h \
executors/ThreadedExecutor.h \
executors/SerialExecutor.h \
executors/ThreadPoolExecutor.h \
executors/ThreadedExecutor.h \
+ executors/TimedDrivableExecutor.h \
executors/task_queue/BlockingQueue.h \
executors/task_queue/LifoSemMPMCQueue.h \
executors/task_queue/PriorityLifoSemMPMCQueue.h \
executors/task_queue/BlockingQueue.h \
executors/task_queue/LifoSemMPMCQueue.h \
executors/task_queue/PriorityLifoSemMPMCQueue.h \
@@
-124,7
+126,6
@@
nobase_follyinclude_HEADERS = \
Expected.h \
concurrency/AtomicSharedPtr.h \
concurrency/detail/AtomicSharedPtr-detail.h \
Expected.h \
concurrency/AtomicSharedPtr.h \
concurrency/detail/AtomicSharedPtr-detail.h \
- experimental/AsymmetricMemoryBarrier.h \
experimental/AutoTimer.h \
experimental/ThreadedRepeatingFunctionRunner.h \
experimental/Bits.h \
experimental/AutoTimer.h \
experimental/ThreadedRepeatingFunctionRunner.h \
experimental/Bits.h \
@@
-154,14
+155,21
@@
nobase_follyinclude_HEADERS = \
experimental/JSONSchema.h \
experimental/LockFreeRingBuffer.h \
experimental/logging/AsyncFileWriter.h \
experimental/JSONSchema.h \
experimental/LockFreeRingBuffer.h \
experimental/logging/AsyncFileWriter.h \
+ experimental/logging/FileHandlerFactory.h \
+ experimental/logging/FileWriterFactory.h \
experimental/logging/GlogStyleFormatter.h \
experimental/logging/ImmediateFileWriter.h \
experimental/logging/Init.h \
experimental/logging/LogCategory.h \
experimental/logging/GlogStyleFormatter.h \
experimental/logging/ImmediateFileWriter.h \
experimental/logging/Init.h \
experimental/logging/LogCategory.h \
+ experimental/logging/LogCategoryConfig.h \
+ experimental/logging/LogConfig.h \
+ experimental/logging/LogConfigParser.h \
experimental/logging/LogFormatter.h \
experimental/logging/Logger.h \
experimental/logging/LoggerDB.h \
experimental/logging/LogHandler.h \
experimental/logging/LogFormatter.h \
experimental/logging/Logger.h \
experimental/logging/LoggerDB.h \
experimental/logging/LogHandler.h \
+ experimental/logging/LogHandlerFactory.h \
+ experimental/logging/LogHandlerConfig.h \
experimental/logging/LogLevel.h \
experimental/logging/LogMessage.h \
experimental/logging/LogName.h \
experimental/logging/LogLevel.h \
experimental/logging/LogMessage.h \
experimental/logging/LogName.h \
@@
-171,6
+179,8
@@
nobase_follyinclude_HEADERS = \
experimental/logging/printf.h \
experimental/logging/RateLimiter.h \
experimental/logging/StandardLogHandler.h \
experimental/logging/printf.h \
experimental/logging/RateLimiter.h \
experimental/logging/StandardLogHandler.h \
+ experimental/logging/StandardLogHandlerFactory.h \
+ experimental/logging/StreamHandlerFactory.h \
experimental/logging/xlog.h \
experimental/NestedCommandLineApp.h \
experimental/observer/detail/Core.h \
experimental/logging/xlog.h \
experimental/NestedCommandLineApp.h \
experimental/observer/detail/Core.h \
@@
-312,10
+322,14
@@
nobase_follyinclude_HEADERS = \
io/async/test/UndelayedDestruction.h \
io/async/test/Util.h \
json.h \
io/async/test/UndelayedDestruction.h \
io/async/test/Util.h \
json.h \
+ lang/Align.h \
lang/Assume.h \
lang/Assume.h \
- Launder.h \
+ lang/Bits.h \
+ lang/ColdClass.h \
+ lang/Launder.h \
+ lang/RValueReferenceWrapper.h \
+ lang/SafeAssert.h \
Lazy.h \
Lazy.h \
- LifoSem.h \
Likely.h \
LockTraits.h \
LockTraitsBoost.h \
Likely.h \
LockTraits.h \
LockTraitsBoost.h \
@@
-341,6
+355,10
@@
nobase_follyinclude_HEADERS = \
PackedSyncPtr.h \
Padded.h \
PicoSpinLock.h \
PackedSyncPtr.h \
Padded.h \
PicoSpinLock.h \
+ Poly.h \
+ Poly-inl.h \
+ poly/Nullable.h \
+ poly/Regular.h \
Portability.h \
portability/Asm.h \
portability/Atomic.h \
Portability.h \
portability/Asm.h \
portability/Atomic.h \
@@
-387,8
+405,6
@@
nobase_follyinclude_HEADERS = \
Random-inl.h \
Range.h \
Replaceable.h \
Random-inl.h \
Range.h \
Replaceable.h \
- RWSpinLock.h \
- SafeAssert.h \
ScopeGuard.h \
SharedMutex.h \
Singleton.h \
ScopeGuard.h \
SharedMutex.h \
Singleton.h \
@@
-417,8
+433,18
@@
nobase_follyinclude_HEADERS = \
stats/MultiLevelTimeSeries.h \
stats/TimeseriesHistogram-defs.h \
stats/TimeseriesHistogram.h \
stats/MultiLevelTimeSeries.h \
stats/TimeseriesHistogram-defs.h \
stats/TimeseriesHistogram.h \
+ synchronization/AsymmetricMemoryBarrier.h \
+ synchronization/AtomicStruct.h \
+ synchronization/Baton.h \
synchronization/CallOnce.h \
synchronization/CallOnce.h \
+ synchronization/LifoSem.h \
+ synchronization/ParkingLot.h \
+ synchronization/RWSpinLock.h \
+ synchronization/SaturatingSemaphore.h \
+ synchronization/Tearable.h \
+ synchronization/WaitOptions.h \
synchronization/detail/AtomicUtils.h \
synchronization/detail/AtomicUtils.h \
+ synchronization/detail/Sleeper.h \
system/MemoryMapping.h \
system/Shell.h \
system/ThreadId.h \
system/MemoryMapping.h \
system/Shell.h \
system/ThreadId.h \
@@
-448,7
+474,6
@@
nobase_follyinclude_HEADERS = \
Try.h \
Unicode.h \
Function.h \
Try.h \
Unicode.h \
Function.h \
- Functional.h \
UncaughtExceptions.h \
Unit.h \
Uri.h \
UncaughtExceptions.h \
Unit.h \
Uri.h \
@@
-489,8
+514,10
@@
libfollybase_la_SOURCES = \
libfolly_la_SOURCES = \
ClockGettimeWrappers.cpp \
compression/Compression.cpp \
libfolly_la_SOURCES = \
ClockGettimeWrappers.cpp \
compression/Compression.cpp \
+ compression/Counters.cpp \
compression/Zlib.cpp \
concurrency/CacheLocality.cpp \
compression/Zlib.cpp \
concurrency/CacheLocality.cpp \
+ detail/AtFork.cpp \
detail/Futex.cpp \
detail/IPAddress.cpp \
detail/StaticSingletonManager.cpp \
detail/Futex.cpp \
detail/IPAddress.cpp \
detail/StaticSingletonManager.cpp \
@@
-498,6
+525,7
@@
libfolly_la_SOURCES = \
dynamic.cpp \
ExceptionWrapper.cpp \
Executor.cpp \
dynamic.cpp \
ExceptionWrapper.cpp \
Executor.cpp \
+ Expected.cpp \
File.cpp \
FileUtil.cpp \
FingerprintTables.cpp \
File.cpp \
FileUtil.cpp \
FingerprintTables.cpp \
@@
-516,6
+544,7
@@
libfolly_la_SOURCES = \
executors/SerialExecutor.cpp \
executors/ThreadPoolExecutor.cpp \
executors/ThreadedExecutor.cpp \
executors/SerialExecutor.cpp \
executors/ThreadPoolExecutor.cpp \
executors/ThreadedExecutor.cpp \
+ executors/TimedDrivableExecutor.cpp \
executors/QueuedImmediateExecutor.cpp \
experimental/hazptr/hazptr.cpp \
experimental/hazptr/memory_resource.cpp \
executors/QueuedImmediateExecutor.cpp \
experimental/hazptr/hazptr.cpp \
experimental/hazptr/memory_resource.cpp \
@@
-527,7
+556,6
@@
libfolly_la_SOURCES = \
IPAddress.cpp \
IPAddressV4.cpp \
IPAddressV6.cpp \
IPAddress.cpp \
IPAddressV4.cpp \
IPAddressV6.cpp \
- LifoSem.cpp \
init/Init.cpp \
io/Cursor.cpp \
io/IOBuf.cpp \
init/Init.cpp \
io/Cursor.cpp \
io/IOBuf.cpp \
@@
-561,6
+589,8
@@
libfolly_la_SOURCES = \
io/async/ssl/SSLErrors.cpp \
json.cpp \
lang/Assume.cpp \
io/async/ssl/SSLErrors.cpp \
json.cpp \
lang/Assume.cpp \
+ lang/ColdClass.cpp \
+ lang/SafeAssert.cpp \
detail/MemoryIdler.cpp \
detail/SocketFastOpen.cpp \
MacAddress.cpp \
detail/MemoryIdler.cpp \
detail/SocketFastOpen.cpp \
MacAddress.cpp \
@@
-569,7
+599,6
@@
libfolly_la_SOURCES = \
portability/Fcntl.cpp \
portability/Libgen.cpp \
portability/Malloc.cpp \
portability/Fcntl.cpp \
portability/Libgen.cpp \
portability/Malloc.cpp \
- portability/Memory.cpp \
portability/OpenSSL.cpp \
portability/PThread.cpp \
portability/Sockets.cpp \
portability/OpenSSL.cpp \
portability/PThread.cpp \
portability/Sockets.cpp \
@@
-586,7
+615,6
@@
libfolly_la_SOURCES = \
portability/Time.cpp \
portability/Unistd.cpp \
Random.cpp \
portability/Time.cpp \
portability/Unistd.cpp \
Random.cpp \
- SafeAssert.cpp \
ScopeGuard.cpp \
SharedMutex.cpp \
MicroLock.cpp \
ScopeGuard.cpp \
SharedMutex.cpp \
MicroLock.cpp \
@@
-602,6
+630,10
@@
libfolly_la_SOURCES = \
stats/Histogram.cpp \
stats/MultiLevelTimeSeries.cpp \
stats/TimeseriesHistogram.cpp \
stats/Histogram.cpp \
stats/MultiLevelTimeSeries.cpp \
stats/TimeseriesHistogram.cpp \
+ synchronization/AsymmetricMemoryBarrier.cpp \
+ synchronization/LifoSem.cpp \
+ synchronization/ParkingLot.cpp \
+ synchronization/WaitOptions.cpp \
system/MemoryMapping.cpp \
system/Shell.cpp \
system/ThreadName.cpp \
system/MemoryMapping.cpp \
system/Shell.cpp \
system/ThreadName.cpp \
@@
-610,7
+642,6
@@
libfolly_la_SOURCES = \
TimeoutQueue.cpp \
Try.cpp \
Uri.cpp \
TimeoutQueue.cpp \
Try.cpp \
Uri.cpp \
- experimental/AsymmetricMemoryBarrier.cpp \
experimental/ThreadedRepeatingFunctionRunner.cpp \
experimental/bser/Dump.cpp \
experimental/bser/Load.cpp \
experimental/ThreadedRepeatingFunctionRunner.cpp \
experimental/bser/Dump.cpp \
experimental/bser/Load.cpp \
@@
-706,6
+737,11
@@
libfolly_la_SOURCES += \
experimental/symbolizer/Symbolizer.cpp
endif
experimental/symbolizer/Symbolizer.cpp
endif
+if HAVE_VARIABLE_TEMPLATES
+libfolly_la_SOURCES += \
+ Poly.cpp
+endif
+
libfollybasesse42_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
libfollybasesse42_la_CXXFLAGS = -msse4.2 -mpclmul
libfollybasesse42_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
libfollybasesse42_la_CXXFLAGS = -msse4.2 -mpclmul
@@
-715,6
+751,10
@@
libfollybase_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
libfolly_la_LIBADD = libfollybase.la
libfolly_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) -lssl
libfolly_la_LIBADD = libfollybase.la
libfolly_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) -lssl
+if USE_SYMBOLIZER
+libfolly_la_LDFLAGS += -lunwind
+endif
+
FingerprintTables.cpp: generate_fingerprint_tables
./generate_fingerprint_tables
CLEANFILES += FingerprintTables.cpp
FingerprintTables.cpp: generate_fingerprint_tables
./generate_fingerprint_tables
CLEANFILES += FingerprintTables.cpp