move MemoryMapping, Shell, ThreadId, ThreadName, and VersionCheck to system/

[folly.git] / folly / Makefile.am

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 7159baeaf0067ad4cf182a88b032ddb17df92cd7..cbc950b2f7081cf33eaf3ccb7a4ebcc6210849e5 100644 (file)
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -27,7 +27,6 @@ lib_LTLIBRARIES = \
 follyincludedir = $(includedir)/folly
 
 nobase_follyinclude_HEADERS = \
-       ApplyTuple.h \
        Arena.h \
        Arena-inl.h \
        Array.h \
@@ -45,7 +44,6 @@ nobase_follyinclude_HEADERS = \
        Benchmark.h \
        Bits.h \
        CachelinePadded.h \
-       CallOnce.h \
        Chrono.h \
        ClockGettimeWrappers.h \
        ConcurrentSkipList.h \
@@ -55,6 +53,9 @@ 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 \
@@ -85,7 +86,6 @@ nobase_follyinclude_HEADERS = \
        detail/TurnSequencer.h \
        detail/UncaughtExceptionCounter.h \
        executors/Async.h \
-       executors/BlockingQueue.h \
        executors/CPUThreadPoolExecutor.h \
        executors/Codel.h \
        executors/DrivableExecutor.h \
@@ -95,16 +95,19 @@ nobase_follyinclude_HEADERS = \
        executors/IOExecutor.h \
        executors/IOObjectCache.h \
        executors/IOThreadPoolExecutor.h \
-       executors/LifoSemMPMCQueue.h \
-       executors/NamedThreadFactory.h \
        executors/NotificationQueueExecutor.h \
-       executors/PriorityLifoSemMPMCQueue.h \
-       executors/PriorityThreadFactory.h \
+       executors/ScheduledExecutor.h \
        executors/SerialExecutor.h \
-       executors/ThreadFactory.h \
        executors/ThreadPoolExecutor.h \
        executors/ThreadedExecutor.h \
-       executors/UnboundedBlockingQueue.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 \
@@ -205,6 +208,7 @@ nobase_follyinclude_HEADERS = \
        Format.h \
        Format-inl.h \
        functional/Invoke.h \
+       functional/Partial.h \
        futures/Barrier.h \
        futures/Future-pre.h \
        futures/helpers.h \
@@ -216,9 +220,6 @@ nobase_follyinclude_HEADERS = \
        futures/ManualExecutor.h \
        futures/Promise-inl.h \
        futures/Promise.h \
-       futures/QueuedImmediateExecutor.h \
-       futures/Retrying.h \
-       futures/ScheduledExecutor.h \
        futures/SharedPromise.h \
        futures/SharedPromise-inl.h \
        futures/ThreadWheelTimekeeper.h \
@@ -255,7 +256,6 @@ nobase_follyinclude_HEADERS = \
        IndexedMemPool.h \
        init/Init.h \
        IntrusiveList.h \
-       io/Compression.h \
        io/Cursor.h \
        io/Cursor-inl.h \
        io/IOBuf.h \
@@ -313,8 +313,6 @@ nobase_follyinclude_HEADERS = \
        io/async/test/TimeUtil.h \
        io/async/test/UndelayedDestruction.h \
        io/async/test/Util.h \
-       io/compression/Utils.h \
-       io/compression/Zlib.h \
        Iterator.h \
        json.h \
        Launder.h \
@@ -325,12 +323,11 @@ nobase_follyinclude_HEADERS = \
        LockTraitsBoost.h \
        Logging.h \
        MacAddress.h \
-       MallctlHelper.h \
        Malloc.h \
        MapUtil.h \
        Math.h \
        Memory.h \
-       MemoryMapping.h \
+       memory/MallctlHelper.h \
        memory/UninitializedMemoryHacks.h \
        MicroSpinLock.h \
        MicroLock.h \
@@ -341,7 +338,6 @@ nobase_follyinclude_HEADERS = \
        Overload.h \
        PackedSyncPtr.h \
        Padded.h \
-       Partial.h \
        PicoSpinLock.h \
        Portability.h \
        portability/Asm.h \
@@ -393,7 +389,6 @@ nobase_follyinclude_HEADERS = \
        SafeAssert.h \
        ScopeGuard.h \
        SharedMutex.h \
-       Shell.h \
        Singleton.h \
        Singleton-inl.h \
        SingletonThreadLocal.h \
@@ -421,6 +416,12 @@ nobase_follyinclude_HEADERS = \
        stats/MultiLevelTimeSeries.h \
        stats/TimeseriesHistogram-defs.h \
        stats/TimeseriesHistogram.h \
+       synchronization/CallOnce.h \
+       system/MemoryMapping.h \
+       system/Shell.h \
+       system/ThreadId.h \
+       system/ThreadName.h \
+       system/VersionCheck.h \
        stop_watch.h \
        String.h \
        String-inl.h \
@@ -436,9 +437,7 @@ nobase_follyinclude_HEADERS = \
        test/TestUtils.h \
        ThreadCachedArena.h \
        ThreadCachedInt.h \
-       ThreadId.h \
        ThreadLocal.h \
-       ThreadName.h \
        TimeoutQueue.h \
        TokenBucket.h \
        tracing/StaticTracepoint.h \
@@ -454,8 +453,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
@@ -482,7 +480,7 @@ libfollybase_la_SOURCES = \
        Format.cpp \
        FormatArg.cpp \
        FormatTables.cpp \
-       MallctlHelper.cpp \
+       memory/MallctlHelper.cpp \
        portability/BitsFunctexcept.cpp \
        String.cpp \
        Unicode.cpp
@@ -490,6 +488,8 @@ libfollybase_la_SOURCES = \
 libfolly_la_SOURCES = \
        Assume.cpp \
        ClockGettimeWrappers.cpp \
+       compression/Compression.cpp \
+       compression/Zlib.cpp \
        concurrency/CacheLocality.cpp \
        concurrency/GlobalThreadPoolList.cpp \
        detail/Futex.cpp \
@@ -505,8 +505,8 @@ libfolly_la_SOURCES = \
        futures/Barrier.cpp \
        futures/Future.cpp \
        futures/FutureException.cpp \
+       futures/InlineExecutor.cpp \
        futures/ManualExecutor.cpp \
-       futures/QueuedImmediateExecutor.cpp \
        futures/ThreadWheelTimekeeper.cpp \
        futures/test/TestExecutor.cpp \
        executors/CPUThreadPoolExecutor.cpp \
@@ -516,6 +516,7 @@ libfolly_la_SOURCES = \
        executors/SerialExecutor.cpp \
        executors/ThreadPoolExecutor.cpp \
        executors/ThreadedExecutor.cpp \
+       executors/QueuedImmediateExecutor.cpp \
        experimental/hazptr/hazptr.cpp \
        experimental/hazptr/memory_resource.cpp \
        GroupVarint.cpp \
@@ -528,7 +529,6 @@ libfolly_la_SOURCES = \
        IPAddressV6.cpp \
        LifoSem.cpp \
        init/Init.cpp \
-       io/Compression.cpp \
        io/Cursor.cpp \
        io/IOBuf.cpp \
        io/IOBufQueue.cpp \
@@ -559,12 +559,10 @@ libfolly_la_SOURCES = \
        io/async/test/TimeUtil.cpp \
        io/async/ssl/OpenSSLUtils.cpp \
        io/async/ssl/SSLErrors.cpp \
-       io/compression/Zlib.cpp \
        json.cpp \
        detail/MemoryIdler.cpp \
        detail/SocketFastOpen.cpp \
        MacAddress.cpp \
-       MemoryMapping.cpp \
        portability/Dirent.cpp \
        portability/Fcntl.cpp \
        portability/Libgen.cpp \
@@ -589,7 +587,6 @@ libfolly_la_SOURCES = \
        SafeAssert.cpp \
        ScopeGuard.cpp \
        SharedMutex.cpp \
-       Shell.cpp \
        MicroLock.cpp \
        Optional.cpp \
        Singleton.cpp \
@@ -603,13 +600,15 @@ 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 \