Move some memory related files from util/ to memory/ (facebook#5382)

Summary: Move arena, allocator, and memory tools under util to a separate memory/ directory. Pull Request resolved: facebook#5382 Differential Revision: D15564655 Pulled By: siying fbshipit-source-id: 9cd6b5d0d3d52b39606e19221fa154596e5852a5
hx235 · May 31, 2019 · 8843129 · 8843129
1 parent f1302eb
commit 8843129
Show file tree

Hide file tree

Showing 196 changed files with 397 additions and 413 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -542,6 +542,9 @@ set(SOURCES
         file/file_util.cc
         file/filename.cc
         file/sst_file_manager_impl.cc
+        memory/arena.cc
+        memory/concurrent_arena.cc
+        memory/jemalloc_nodump_allocator.cc
         memtable/alloc_tracker.cc
         memtable/hash_linklist_rep.cc
         memtable/hash_skiplist_rep.cc
@@ -610,22 +613,19 @@ set(SOURCES
         tools/ldb_tool.cc
         tools/sst_dump_tool.cc
         tools/trace_analyzer_tool.cc
-        util/arena.cc
         util/auto_roll_logger.cc
         util/bloom.cc
         util/coding.cc
         util/compaction_job_stats_impl.cc
         util/comparator.cc
         util/compression_context_cache.cc
-        util/concurrent_arena.cc
         util/concurrent_task_limiter_impl.cc
         util/crc32c.cc
         util/dynamic_bloom.cc
         util/event_logger.cc
         util/file_reader_writer.cc
         util/filter_policy.cc
         util/hash.cc
-        util/jemalloc_nodump_allocator.cc
         util/log_buffer.cc
         util/murmurhash.cc
         util/random.cc
@@ -932,6 +932,7 @@ if(WITH_TESTS)
         env/env_test.cc
         env/mock_env_test.cc
         file/delete_scheduler_test.cc
+        memory/arena_test.cc
         memtable/inlineskiplist_test.cc
         memtable/skiplist_test.cc
         memtable/write_buffer_manager_test.cc
@@ -955,7 +956,6 @@ if(WITH_TESTS)
         tools/reduce_levels_test.cc
         tools/sst_dump_test.cc
         tools/trace_analyzer_test.cc
-        util/arena_test.cc
         util/auto_roll_logger_test.cc
         util/autovector_test.cc
         util/bloom_test.cc

diff --git a/Makefile b/Makefile
@@ -1127,7 +1127,7 @@ db_sanity_test: tools/db_sanity_test.o $(LIBOBJECTS) $(TESTUTIL)
 db_repl_stress: tools/db_repl_stress.o $(LIBOBJECTS) $(TESTUTIL)
 	$(AM_LINK)
 
-arena_test: util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS)
+arena_test: memory/arena_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 autovector_test: util/autovector_test.o $(LIBOBJECTS) $(TESTHARNESS)

diff --git a/TARGETS b/TARGETS
@@ -147,6 +147,9 @@ cpp_library(
         "file/file_util.cc",
         "file/filename.cc",
         "file/sst_file_manager_impl.cc",
+        "memory/arena.cc",
+        "memory/concurrent_arena.cc",
+        "memory/jemalloc_nodump_allocator.cc",
         "memtable/alloc_tracker.cc",
         "memtable/hash_linklist_rep.cc",
         "memtable/hash_skiplist_rep.cc",
@@ -181,8 +184,8 @@ cpp_library(
         "table/block_based/block_based_table_reader.cc",
         "table/block_based/block_builder.cc",
         "table/block_based/block_prefix_index.cc",
-        "table/block_based/data_block_hash_index.cc",
         "table/block_based/data_block_footer.cc",
+        "table/block_based/data_block_hash_index.cc",
         "table/block_based/flush_block_policy.cc",
         "table/block_based/full_filter_block.cc",
         "table/block_based/index_builder.cc",
@@ -214,23 +217,20 @@ cpp_library(
         "tools/ldb_cmd.cc",
         "tools/ldb_tool.cc",
         "tools/sst_dump_tool.cc",
-        "util/arena.cc",
         "util/auto_roll_logger.cc",
         "util/bloom.cc",
         "util/build_version.cc",
         "util/coding.cc",
         "util/compaction_job_stats_impl.cc",
         "util/comparator.cc",
         "util/compression_context_cache.cc",
-        "util/concurrent_arena.cc",
         "util/concurrent_task_limiter_impl.cc",
         "util/crc32c.cc",
         "util/dynamic_bloom.cc",
         "util/event_logger.cc",
         "util/file_reader_writer.cc",
         "util/filter_policy.cc",
         "util/hash.cc",
-        "util/jemalloc_nodump_allocator.cc",
         "util/log_buffer.cc",
         "util/murmurhash.cc",
         "util/random.cc",
@@ -353,7 +353,7 @@ cpp_library(
 ROCKS_TESTS = [
     [
         "arena_test",
-        "util/arena_test.cc",
+        "memory/arena_test.cc",
         "serial",
     ],
     [

diff --git a/cache/cache_test.cc b/cache/cache_test.cc
@@ -16,9 +16,9 @@
 #include <vector>
 #include "cache/clock_cache.h"
 #include "cache/lru_cache.h"
+#include "test_util/testharness.h"
 #include "util/coding.h"
 #include "util/string_util.h"
-#include "test_util/testharness.h"
 
 namespace rocksdb {
 

diff --git a/db/builder.cc b/db/builder.cc
@@ -32,9 +32,9 @@
 #include "table/block_based/block_based_table_builder.h"
 #include "table/format.h"
 #include "table/internal_iterator.h"
+#include "test_util/sync_point.h"
 #include "util/file_reader_writer.h"
 #include "util/stop_watch.h"
-#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/column_family_test.cc b/db/column_family_test.cc
@@ -20,12 +20,12 @@
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
-#include "util/coding.h"
 #include "test_util/fault_injection_test_env.h"
-#include "util/string_util.h"
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
+#include "util/coding.h"
+#include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

diff --git a/db/compact_files_test.cc b/db/compact_files_test.cc
@@ -14,9 +14,9 @@
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "util/string_util.h"
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
+#include "util/string_util.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction.cc b/db/compaction.cc
@@ -18,8 +18,8 @@
 
 #include "db/column_family.h"
 #include "rocksdb/compaction_filter.h"
-#include "util/string_util.h"
 #include "test_util/sync_point.h"
+#include "util/string_util.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction.h b/db/compaction.h
@@ -9,8 +9,8 @@
 
 #pragma once
 #include "db/version_set.h"
+#include "memory/arena.h"
 #include "options/cf_options.h"
-#include "util/arena.h"
 #include "util/autovector.h"
 
 namespace rocksdb {

diff --git a/db/compaction_iterator_test.cc b/db/compaction_iterator_test.cc
@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "port/port.h"
-#include "util/string_util.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
+#include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

diff --git a/db/compaction_job.cc b/db/compaction_job.cc
@@ -53,6 +53,7 @@
 #include "table/block_based/block_based_table_factory.h"
 #include "table/merging_iterator.h"
 #include "table/table_builder.h"
+#include "test_util/sync_point.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
 #include "util/log_buffer.h"
@@ -61,7 +62,6 @@
 #include "util/random.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction_job_stats_test.cc b/db/compaction_job_stats_test.cc
@@ -52,15 +52,15 @@
 #include "table/mock_table.h"
 #include "table/plain/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
+#include "test_util/sync_point.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "util/compression.h"
 #include "util/hash.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
 #include "util/string_util.h"
-#include "test_util/sync_point.h"
-#include "test_util/testharness.h"
-#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 #if !defined(IOS_CROSS_COMPILE)

diff --git a/db/compaction_job_test.cc b/db/compaction_job_test.cc
@@ -25,10 +25,10 @@
 #include "rocksdb/options.h"
 #include "rocksdb/write_buffer_manager.h"
 #include "table/mock_table.h"
-#include "util/file_reader_writer.h"
-#include "util/string_util.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
+#include "util/file_reader_writer.h"
+#include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

diff --git a/db/compaction_picker.cc b/db/compaction_picker.cc
@@ -22,10 +22,10 @@
 #include "db/column_family.h"
 #include "file/filename.h"
 #include "monitoring/statistics.h"
+#include "test_util/sync_point.h"
 #include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"
-#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction_picker_test.cc b/db/compaction_picker_test.cc
@@ -12,10 +12,10 @@
 #include "db/compaction_picker_fifo.h"
 #include "db/compaction_picker_universal.h"
 
-#include "util/logging.h"
-#include "util/string_util.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
+#include "util/logging.h"
+#include "util/string_util.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction_picker_universal.cc b/db/compaction_picker_universal.cc
@@ -22,10 +22,10 @@
 #include "db/column_family.h"
 #include "file/filename.h"
 #include "monitoring/statistics.h"
+#include "test_util/sync_point.h"
 #include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"
-#include "test_util/sync_point.h"
 
 namespace rocksdb {
 namespace {

diff --git a/db/comparator_db_test.cc b/db/comparator_db_test.cc
@@ -9,11 +9,11 @@
 #include "memtable/stl_wrappers.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "util/hash.h"
 #include "util/kv_map.h"
 #include "util/string_util.h"
-#include "test_util/testharness.h"
-#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 using std::unique_ptr;

diff --git a/db/corruption_test.cc b/db/corruption_test.cc
@@ -27,10 +27,9 @@
 #include "rocksdb/write_batch.h"
 #include "table/block_based/block_based_table_builder.h"
 #include "table/meta_blocks.h"
-#include "file/filename.h"
-#include "util/string_util.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
+#include "util/string_util.h"
 
 namespace rocksdb {
 

diff --git a/db/cuckoo_table_db_test.cc b/db/cuckoo_table_db_test.cc
@@ -11,9 +11,9 @@
 #include "table/cuckoo/cuckoo_table_factory.h"
 #include "table/cuckoo/cuckoo_table_reader.h"
 #include "table/meta_blocks.h"
-#include "util/string_util.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
+#include "util/string_util.h"
 
 namespace rocksdb {
 

diff --git a/db/db_compaction_test.cc b/db/db_compaction_test.cc
@@ -13,9 +13,9 @@
 #include "rocksdb/concurrent_task_limiter.h"
 #include "rocksdb/experimental.h"
 #include "rocksdb/utilities/convenience.h"
-#include "util/concurrent_task_limiter_impl.h"
 #include "test_util/fault_injection_test_env.h"
 #include "test_util/sync_point.h"
+#include "util/concurrent_task_limiter_impl.h"
 
 namespace rocksdb {
 

diff --git a/db/db_filesnapshot.cc b/db/db_filesnapshot.cc
@@ -22,8 +22,8 @@
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "util/mutexlock.h"
 #include "test_util/sync_point.h"
+#include "util/mutexlock.h"
 
 namespace rocksdb {
 

diff --git a/db/db_impl.cc b/db/db_impl.cc
@@ -84,6 +84,7 @@
 #include "table/multiget_context.h"
 #include "table/table_builder.h"
 #include "table/two_level_iterator.h"
+#include "test_util/sync_point.h"
 #include "tools/sst_dump_tool_imp.h"
 #include "util/auto_roll_logger.h"
 #include "util/autovector.h"
@@ -97,7 +98,6 @@
 #include "util/mutexlock.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "test_util/sync_point.h"
 
 namespace rocksdb {
 const std::string kDefaultColumnFamilyName("default");

diff --git a/db/db_impl_compaction_flush.cc b/db/db_impl_compaction_flush.cc
@@ -21,8 +21,8 @@
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/thread_status_updater.h"
 #include "monitoring/thread_status_util.h"
-#include "util/concurrent_task_limiter_impl.h"
 #include "test_util/sync_point.h"
+#include "util/concurrent_task_limiter_impl.h"
 
 namespace rocksdb {
 

diff --git a/db/db_impl_open.cc b/db/db_impl_open.cc
@@ -19,8 +19,8 @@
 #include "options/options_helper.h"
 #include "rocksdb/wal_filter.h"
 #include "table/block_based/block_based_table_factory.h"
-#include "util/rate_limiter.h"
 #include "test_util/sync_point.h"
+#include "util/rate_limiter.h"
 
 namespace rocksdb {
 Options SanitizeOptions(const std::string& dbname, const Options& src) {

diff --git a/db/db_iter.cc b/db/db_iter.cc
@@ -17,14 +17,14 @@
 #include "db/merge_helper.h"
 #include "db/pinned_iterators_manager.h"
 #include "file/filename.h"
+#include "memory/arena.h"
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/options.h"
 #include "table/internal_iterator.h"
 #include "table/iterator_wrapper.h"
-#include "util/arena.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"

diff --git a/db/db_iter.h b/db/db_iter.h
@@ -13,10 +13,10 @@
 #include "db/db_impl.h"
 #include "db/dbformat.h"
 #include "db/range_del_aggregator.h"
+#include "memory/arena.h"
 #include "options/cf_options.h"
 #include "rocksdb/db.h"
 #include "rocksdb/iterator.h"
-#include "util/arena.h"
 #include "util/autovector.h"
 
 namespace rocksdb {