SERVER-26709 Merge mongo/platform/platform and mongo/util/foundation into mongo/base library.

23 files changed, 31 insertions, 87 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index ca0702f7a3d..5e10ef8bbc8 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -96,7 +96,14 @@ baseSource=[
     'logger/rotatable_file_manager.cpp',
     'logger/rotatable_file_writer.cpp',
     'platform/decimal128.cpp',
+    'platform/posix_fadvise.cpp',
+    'platform/process_id.cpp',
     'platform/random.cpp',
+    'platform/shared_library.cpp',
+    'platform/shared_library_${TARGET_OS_FAMILY}.cpp',
+    'platform/stack_locator.cpp',
+    'platform/stack_locator_${TARGET_OS}.cpp',
+    'platform/strcasestr.cpp',
     'platform/strnlen.cpp',
     'util/allocator.cpp',
     'util/assert_util.cpp',
@@ -105,18 +112,22 @@ baseSource=[
     'util/duration.cpp',
     'util/exception_filter_win32.cpp',
     'util/exit.cpp',
+    'util/file.cpp',
     'util/hex.cpp',
     'util/itoa.cpp',
     'util/log.cpp',
+    'util/platform_init.cpp',
     'util/signal_handlers_synchronous.cpp',
     'util/stacktrace.cpp',
     'util/stacktrace_${TARGET_OS_FAMILY}.cpp',
+    'util/startup_test.cpp',
     'util/static_observer.cpp',
     'util/stringutils.cpp',
     'util/system_clock_source.cpp',
     'util/system_tick_source.cpp',
     'util/text.cpp',
     'util/time_support.cpp',
+    'util/timer.cpp',
     'util/version.cpp',
 ]
 
@@ -124,9 +135,10 @@ baseLibDeps=[
     # NOTE: This library *must not* depend on any libraries than
     # the ones declared here. Do not add to this list.
     '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
+    '$BUILD_DIR/third_party/shim_allocator',
     '$BUILD_DIR/third_party/shim_boost',
-    '$BUILD_DIR/third_party/shim_pcrecpp',
     '$BUILD_DIR/third_party/shim_intel_decimal128',
+    '$BUILD_DIR/third_party/shim_pcrecpp',
     '$BUILD_DIR/third_party/shim_tz',
     'logger/max_log_size',
     'util/debugger',
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript
index 5e80f2a7b52..e058a42b225 100644
--- a/src/mongo/client/SConscript
+++ b/src/mongo/client/SConscript
@@ -85,7 +85,6 @@ saslClientEnv.Library(
         '$BUILD_DIR/mongo/executor/remote_command',
         '$BUILD_DIR/mongo/rpc/command_status',
         '$BUILD_DIR/mongo/rpc/metadata',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/md5',
         '$BUILD_DIR/mongo/util/net/network',
     ],
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index fdf52a9843e..d0b5dd113e1 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -47,7 +47,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/index_names',
         '$BUILD_DIR/mongo/db/write_concern_options',
-        '$BUILD_DIR/mongo/util/foundation',
     ]
 )
 
@@ -197,7 +196,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/md5',
     ]
 )
@@ -210,7 +208,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
     ],
 )
 
@@ -241,7 +238,7 @@ env.Library(
         'namespace_string.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -262,7 +259,6 @@ env.Library(
     ],
     LIBDEPS=[
         "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/util/foundation",
     ],
 )
 
@@ -506,7 +502,6 @@ env.Library(
         "lasterror.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/util/foundation',
         'service_context',
     ],
 )
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 89fee1b8572..868484de229 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -75,7 +75,6 @@ env.Library(
         '$BUILD_DIR/mongo/transport/message_compressor',
         '$BUILD_DIR/mongo/transport/transport_layer_common',
         '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/ntservice',
         '$BUILD_DIR/mongo/util/processinfo',
         'server_status_core',
diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript
index dd3679a1b78..c823280f415 100644
--- a/src/mongo/db/concurrency/SConscript
+++ b/src/mongo/db/concurrency/SConscript
@@ -23,7 +23,6 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/util/background_job',
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
         # Temporary crutch since the ssl cleanup is hard coded in background.cpp
         '$BUILD_DIR/mongo/util/net/network',
         '$BUILD_DIR/mongo/db/server_parameters',
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index d50fd5acdeb..45268af4500 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -55,7 +55,6 @@ baseEnv.Library('base', [
                     "$BUILD_DIR/mongo/db/bson/dotted_path_support",
                     "$BUILD_DIR/mongo/db/common",
                     "$BUILD_DIR/mongo/db/fts/unicode/unicode",
-                    "$BUILD_DIR/mongo/platform/platform",
                     "$BUILD_DIR/mongo/util/md5",
                     "$BUILD_DIR/third_party/shim_stemmer",
                     ])
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript
index 69ba2abcb93..78ba7a0c635 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -13,7 +13,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
         '$BUILD_DIR/mongo/db/common',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/db/matcher/expressions',
     ],
 )
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index b55d164ec4c..3aeea52b08c 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -22,7 +22,7 @@ env.Library(
         'field_path.cpp',
         ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/base',
         ]
     )
 
@@ -45,7 +45,6 @@ env.Library(
     LIBDEPS=[
         'field_path',
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/intrusive_counter',
         ]
     )
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index d92b0575b0a..c5588414d58 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -100,7 +100,6 @@ env.Library(
         'task_runner',
         '$BUILD_DIR/mongo/executor/network_interface',
         '$BUILD_DIR/mongo/executor/task_executor_interface',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/net/hostandport',
     ],
 )
@@ -1050,7 +1049,6 @@ env.Library(
     LIBDEPS=[
         'optime',
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
     ],
 )
 
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index bf22a72eb58..5d8fc0e31be 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -9,7 +9,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/concurrency/spin_lock',
     ],
 )
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index 4680e07f672..d65046ed6fa 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -1,3 +1,4 @@
+# -*- mode: python -*-
 Import("env")
 
 env.SConscript(
@@ -155,7 +156,6 @@ env.Library(
         'storage_engine_lock_file_${TARGET_OS_FAMILY}.cpp',
         ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/platform/platform',
         'paths',
         ]
     )
diff --git a/src/mongo/db/storage/ephemeral_for_test/SConscript b/src/mongo/db/storage/ephemeral_for_test/SConscript
index 02e848fa9c2..c3ec899e74a 100644
--- a/src/mongo/db/storage/ephemeral_for_test/SConscript
+++ b/src/mongo/db/storage/ephemeral_for_test/SConscript
@@ -1,3 +1,4 @@
+# -*- mode: python -*-
 Import("env")
 
 env.Library(
@@ -8,7 +9,6 @@ env.Library(
     LIBDEPS= [
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/storage/oplog_hack',
-        '$BUILD_DIR/mongo/util/foundation',
         ]
     )
 
@@ -28,7 +28,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_global',
         '$BUILD_DIR/mongo/db/storage/index_entry_comparison',
         '$BUILD_DIR/mongo/db/storage/journal_listener',
-        '$BUILD_DIR/mongo/util/foundation',
         ]
     )
 
diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index e8d9893017f..cfb507c80d7 100644
--- a/src/mongo/db/storage/mmap_v1/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -76,7 +76,6 @@ env.Library(
         ],
     LIBDEPS= [
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
         ]
     )
 
@@ -88,7 +87,6 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/storage/paths',
         '$BUILD_DIR/mongo/util/fail_point',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/processinfo',
     ],
 )
@@ -112,7 +110,6 @@ env.Library(
     ],
     LIBDEPS=[
         'file_allocator',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/progress_meter',
         '$BUILD_DIR/mongo/db/storage/storage_options'
     ],
@@ -194,7 +191,7 @@ if mmapv1:
 
     env.CppUnitTest(target = 'namespace_test',
                     source = ['catalog/namespace_test.cpp'],
-                    LIBDEPS = ['$BUILD_DIR/mongo/util/foundation'])
+                    LIBDEPS = ['$BUILD_DIR/mongo/base'])
 
     env.CppUnitTest(
         target='record_store_v1_simple_test',
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 0137d3d6535..032257889f0 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -1,3 +1,4 @@
+# -*- mode: python -*-
 Import("env")
 Import("wiredtiger")
 Import("get_option")
@@ -55,7 +56,6 @@ if wiredtiger:
             '$BUILD_DIR/mongo/db/storage/storage_options',
             '$BUILD_DIR/mongo/util/concurrency/ticketholder',
             '$BUILD_DIR/mongo/util/elapsed_tracker',
-            '$BUILD_DIR/mongo/util/foundation',
             '$BUILD_DIR/mongo/util/processinfo',
             '$BUILD_DIR/third_party/shim_wiredtiger',
             '$BUILD_DIR/third_party/shim_snappy',
diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript
index 0d0943583c4..dc30106d231 100644
--- a/src/mongo/dbtests/SConscript
+++ b/src/mongo/dbtests/SConscript
@@ -120,7 +120,6 @@ dbtest = env.Program(
         "$BUILD_DIR/mongo/db/repl/replmocks",
         "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/db/storage/paths",
-        "$BUILD_DIR/mongo/platform/platform",
         "$BUILD_DIR/mongo/util/concurrency/rwlock",
         "$BUILD_DIR/mongo/util/net/network",
         "$BUILD_DIR/mongo/util/progress_meter",
diff --git a/src/mongo/platform/SConscript b/src/mongo/platform/SConscript
index 77cfedc6aa2..3d8bca0b958 100644
--- a/src/mongo/platform/SConscript
+++ b/src/mongo/platform/SConscript
@@ -2,31 +2,13 @@
 
 Import("env")
 
-lib_deps = [
-    '$BUILD_DIR/mongo/base',
-]
-source_files = [
-    'posix_fadvise.cpp',
-    'process_id.cpp',
-    'shared_library.cpp',
-    'shared_library_${TARGET_OS_FAMILY}.cpp',
-    'stack_locator.cpp',
-    'stack_locator_${TARGET_OS}.cpp',
-    'strcasestr.cpp',
-]
-
-env.Library(target='platform',
-            source=source_files,
-            LIBDEPS=lib_deps
-)
-
 env.CppUnitTest('atomic_proxy_test', 'atomic_proxy_test.cpp')
 env.CppUnitTest('atomic_word_test', 'atomic_word_test.cpp')
 env.CppUnitTest('bits_test', 'bits_test.cpp')
 env.CppUnitTest('endian_test', 'endian_test.cpp')
-env.CppUnitTest('process_id_test', 'process_id_test.cpp', LIBDEPS=['platform'])
-env.CppUnitTest('random_test', 'random_test.cpp', LIBDEPS=['$BUILD_DIR/mongo/base'])
-env.CppUnitTest('stack_locator_test', 'stack_locator_test.cpp', LIBDEPS=['platform'])
-env.CppUnitTest('decimal128_test', 'decimal128_test.cpp', LIBDEPS=['$BUILD_DIR/mongo/base'])
-env.CppUnitTest('decimal128_bson_test', 'decimal128_bson_test.cpp', LIBDEPS=['$BUILD_DIR/mongo/base'])
+env.CppUnitTest('process_id_test', 'process_id_test.cpp')
+env.CppUnitTest('random_test', 'random_test.cpp')
+env.CppUnitTest('stack_locator_test', 'stack_locator_test.cpp')
+env.CppUnitTest('decimal128_test', 'decimal128_test.cpp')
+env.CppUnitTest('decimal128_bson_test', 'decimal128_bson_test.cpp')
 env.CppUnitTest('overflow_arithmetic_test', 'overflow_arithmetic_test.cpp')
diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript
index d462e592fc2..f4ffc3b4e21 100644
--- a/src/mongo/rpc/SConscript
+++ b/src/mongo/rpc/SConscript
@@ -14,7 +14,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/util/bson_extract',
         '$BUILD_DIR/mongo/db/common',
-        '$BUILD_DIR/mongo/util/foundation'
     ],
 )
 
diff --git a/src/mongo/scripting/SConscript b/src/mongo/scripting/SConscript
index 18574fb2f16..f8fd64d0c91 100644
--- a/src/mongo/scripting/SConscript
+++ b/src/mongo/scripting/SConscript
@@ -19,7 +19,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/client/clientdriver',
         '$BUILD_DIR/mongo/shell/mongojs',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/md5',
     ],
 )
diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript
index 609095c7740..1307514466e 100644
--- a/src/mongo/transport/SConscript
+++ b/src/mongo/transport/SConscript
@@ -8,7 +8,7 @@ env.CppUnitTest(
         'ingress_header_test.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -20,7 +20,6 @@ env.Library(
         'transport_layer.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/net/network',
         '$BUILD_DIR/mongo/transport/message_compressor',
     ],
diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript
index e9274575c9e..94381f8718f 100644
--- a/src/mongo/unittest/SConscript
+++ b/src/mongo/unittest/SConscript
@@ -12,7 +12,6 @@ env.Library(target="unittest",
             ],
             LIBDEPS=[
                 '$BUILD_DIR/mongo/base',
-                '$BUILD_DIR/mongo/util/foundation',
                 '$BUILD_DIR/mongo/util/options_parser/options_parser',
             ])
 
diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
index b88833b8c70..3346a596763 100644
--- a/src/mongo/util/SConscript
+++ b/src/mongo/util/SConscript
@@ -30,7 +30,7 @@ env.Library(
         'intrusive_counter.cpp',
         ],
     LIBDEPS=[
-        'foundation',
+        '$BUILD_DIR/mongo/base',
         ]
     )
 
@@ -85,7 +85,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
     ],
 )
 
@@ -109,7 +108,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/util/foundation',
     ],
 )
 
@@ -143,23 +141,6 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target='foundation',
-    source=[
-        "startup_test.cpp",
-        'file.cpp',
-        'platform_init.cpp',
-        'timer.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/platform/platform',
-        '$BUILD_DIR/third_party/shim_allocator',
-        '$BUILD_DIR/third_party/shim_boost',
-        '$BUILD_DIR/third_party/shim_tz',
-    ],
-)
-
-env.Library(
     target='clock_source_mock',
     source=[
         'clock_source_mock.cpp',
@@ -186,7 +167,7 @@ env.CppUnitTest(
         'text_test.cpp'
     ],
     LIBDEPS=[
-        'foundation',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -196,7 +177,7 @@ env.CppUnitTest(
         'time_support_test.cpp',
     ],
     LIBDEPS=[
-        'foundation',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -218,8 +199,6 @@ env.Library(
     ],
     LIBDEPS=[
         "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/platform/platform",
-        "$BUILD_DIR/mongo/util/foundation",
     ],
 )
 
@@ -266,7 +245,6 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         'concurrency/spin_lock',
-        'foundation',
     ],
 )
 
@@ -329,7 +307,6 @@ env.Library(
         'ntservice.cpp',
     ],
     LIBDEPS=[
-        'foundation',
         'signal_handlers',
         '$BUILD_DIR/mongo/util/options_parser/options_parser',
     ],
@@ -378,7 +355,7 @@ env.Library(
         'elapsed_tracker.cpp',
     ],
     LIBDEPS=[
-        'foundation',
+        '$BUILD_DIR/mongo/base',
         'net/network', # this is for using listener to check elapsed time
     ],
 )
@@ -451,7 +428,6 @@ env.Library(
         "signal_win32.cpp",
     ],
     LIBDEPS=[
-        "foundation",
         "$BUILD_DIR/mongo/base",
         "$BUILD_DIR/mongo/db/service_context",
         "$BUILD_DIR/mongo/db/server_options_core",
@@ -500,7 +476,6 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        'foundation',
     ],
 )
 
@@ -571,7 +546,6 @@ if env.TargetOSIs('windows'):
         ],
         LIBDEPS=[
             '$BUILD_DIR/mongo/base',
-            '$BUILD_DIR/mongo/platform/platform',
         ],
     )
 
diff --git a/src/mongo/util/concurrency/SConscript b/src/mongo/util/concurrency/SConscript
index 584fda96e73..f8dc8f06d77 100644
--- a/src/mongo/util/concurrency/SConscript
+++ b/src/mongo/util/concurrency/SConscript
@@ -9,7 +9,7 @@ env.Library(
         'thread_pool.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript
index 440d6b9465c..b53be63d404 100644
--- a/src/mongo/util/net/SConscript
+++ b/src/mongo/util/net/SConscript
@@ -8,7 +8,7 @@ env.Library(
         'hostandport.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -56,7 +56,6 @@ networkEnv.Library(
         '$BUILD_DIR/mongo/util/concurrency/ticketholder',
         '$BUILD_DIR/mongo/util/decorable',
         '$BUILD_DIR/mongo/util/fail_point',
-        '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/options_parser/options_parser',
         '$BUILD_DIR/third_party/shim_asio',
         'hostandport',