SERVER-37880 Merge the barrier functionality to be part of the unittests library

10 files changed, 5 insertions, 41 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 5cd1763cf13..5e5d85fb2e3 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -247,7 +247,6 @@ env.CppUnitTest(
         'logical_session_id_helpers',
         'service_context',
         '$BUILD_DIR/mongo/db/auth/authmocks',
-        '$BUILD_DIR/mongo/unittest/concurrency',
         '$BUILD_DIR/mongo/util/clock_source_mock',
     ],
 )
@@ -1982,7 +1981,6 @@ env.CppUnitTest(
         'session_catalog_test.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/unittest/concurrency',
         'auth/authmocks',
         'service_context_test_fixture',
         'session_catalog',
diff --git a/src/mongo/db/free_mon/SConscript b/src/mongo/db/free_mon/SConscript
index 5db73b8e36f..0ba806f82a9 100644
--- a/src/mongo/db/free_mon/SConscript
+++ b/src/mongo/db/free_mon/SConscript
@@ -83,7 +83,6 @@ fmEnv.CppUnitTest(
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
         '$BUILD_DIR/mongo/db/service_context_d',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture',
-        '$BUILD_DIR/mongo/unittest/concurrency',
         '$BUILD_DIR/mongo/util/clock_source_mock',
         'free_mon',
     ],
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index ec3ccc6a582..ae8989e9702 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -78,7 +78,6 @@ env.CppUnitTest(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
-        '$BUILD_DIR/mongo/unittest/concurrency',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
         'oplog',
         'oplog_entry',
@@ -462,7 +461,6 @@ env.CppUnitTest(
         'storage_interface_impl',
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
-        '$BUILD_DIR/mongo/unittest/concurrency',
     ],
     NO_CRUTCH = True,
 )
@@ -893,7 +891,6 @@ env.CppUnitTest(
         'replication_coordinator_impl_test.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/unittest/concurrency',
         'repl_coordinator_test_fixture',
     ],
 )
@@ -1365,7 +1362,6 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
         '$BUILD_DIR/mongo/db/service_context_test_fixture',
-        '$BUILD_DIR/mongo/unittest/concurrency',
         '$BUILD_DIR/mongo/unittest/unittest',
     ],
 )
@@ -1515,7 +1511,6 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/query/command_request_response',
         '$BUILD_DIR/mongo/db/service_context_test_fixture',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture',
-        '$BUILD_DIR/mongo/unittest/concurrency',
         'base_cloner_test_fixture',
         'data_replicator_external_state_mock',
         'initial_syncer',
@@ -1543,7 +1538,6 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'rollback_checker',
-        '$BUILD_DIR/mongo/unittest/concurrency',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture',
     ],
 )
diff --git a/src/mongo/db/storage/kv/SConscript b/src/mongo/db/storage/kv/SConscript
index 98507c92657..f8d24f62072 100644
--- a/src/mongo/db/storage/kv/SConscript
+++ b/src/mongo/db/storage/kv/SConscript
@@ -186,7 +186,6 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/storage/devnull/storage_devnull_core',
         '$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test_core',
         '$BUILD_DIR/mongo/db/storage/storage_repair_observer',
-        '$BUILD_DIR/mongo/unittest/concurrency',
         'kv_engine',
         'kv_engine_mock',
     ],
diff --git a/src/mongo/db/transaction_coordinator_test.cpp b/src/mongo/db/transaction_coordinator_test.cpp
index c8b1eae4530..01d3ec53832 100644
--- a/src/mongo/db/transaction_coordinator_test.cpp
+++ b/src/mongo/db/transaction_coordinator_test.cpp
@@ -123,14 +123,6 @@ protected:
         ShardServerTestFixture::tearDown();
     }
 
-    ThreadPool* pool() {
-        return _pool.get();
-    }
-
-    executor::TaskExecutor* executor() {
-        return _executor;
-    }
-
     void assertCommandSentAndRespondWith(const StringData& commandName,
                                          const StatusWith<BSONObj>& response,
                                          boost::optional<BSONObj> expectedWriteConcern) {
diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript
index aab6a91626f..a3ca1bc8b45 100644
--- a/src/mongo/executor/SConscript
+++ b/src/mongo/executor/SConscript
@@ -244,7 +244,6 @@ env.CppUnitTest(
         'thread_pool_task_executor_test.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/unittest/concurrency',
         'thread_pool_task_executor_test_fixture',
     ]
 )
diff --git a/src/mongo/logger/SConscript b/src/mongo/logger/SConscript
index dd69b7cce4a..df030635384 100644
--- a/src/mongo/logger/SConscript
+++ b/src/mongo/logger/SConscript
@@ -16,8 +16,7 @@ env.Program('console_test', 'console_test.cpp',
                          '$BUILD_DIR/mongo/unittest/unittest_main'])
 
 env.CppUnitTest('log_component_settings_test', 'log_component_settings_test.cpp',
-                LIBDEPS=['$BUILD_DIR/mongo/base',
-                         '$BUILD_DIR/mongo/unittest/concurrency'])
+                LIBDEPS=['$BUILD_DIR/mongo/base'])
 
 env.CppUnitTest('log_test', 'log_test.cpp',
                 LIBDEPS=['$BUILD_DIR/mongo/base'])
diff --git a/src/mongo/s/sharding_mongod_test_fixture.cpp b/src/mongo/s/sharding_mongod_test_fixture.cpp
index 784bee96a8f..8c2e9fabb61 100644
--- a/src/mongo/s/sharding_mongod_test_fixture.cpp
+++ b/src/mongo/s/sharding_mongod_test_fixture.cpp
@@ -172,18 +172,12 @@ std::unique_ptr<executor::TaskExecutorPool> ShardingMongodTestFixture::makeTaskE
     // again just the (single) thread the unit test is running on. Therefore, all tasks, local and
     // remote, must be carried out synchronously by the test thread.
     auto fixedTaskExecutor = makeThreadPoolTestExecutor(std::move(netForFixedTaskExecutor));
-
     _networkTestEnv = stdx::make_unique<NetworkTestEnv>(fixedTaskExecutor.get(), _mockNetwork);
 
-    // Set up a NetworkInterfaceMock for the (one) arbitrary TaskExecutor that will go in the set
-    // of arbitrary TaskExecutors.
-    auto netForArbitraryExecutor = stdx::make_unique<executor::NetworkInterfaceMock>();
-
     // Set up (one) TaskExecutor for the set of arbitrary TaskExecutors.
-    auto arbitraryExecutorForExecutorPool =
-        makeThreadPoolTestExecutor(std::move(netForArbitraryExecutor));
     std::vector<std::unique_ptr<executor::TaskExecutor>> arbitraryExecutorsForExecutorPool;
-    arbitraryExecutorsForExecutorPool.emplace_back(std::move(arbitraryExecutorForExecutorPool));
+    arbitraryExecutorsForExecutorPool.emplace_back(
+        makeThreadPoolTestExecutor(stdx::make_unique<executor::NetworkInterfaceMock>()));
 
     // Set up the TaskExecutorPool with the fixed TaskExecutor and set of arbitrary TaskExecutors.
     auto executorPool = stdx::make_unique<executor::TaskExecutorPool>();
diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript
index 1193b6d2b07..21bb594a835 100644
--- a/src/mongo/unittest/SConscript
+++ b/src/mongo/unittest/SConscript
@@ -7,11 +7,12 @@ env = env.Clone()
 env.Library(
     target="unittest",
     source=[
+        'barrier.cpp',
         'bson_test_util.cpp',
         'death_test.cpp',
         'temp_dir.cpp',
-        'unittest.cpp',
         'unittest_helpers.cpp',
+        'unittest.cpp',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
@@ -80,16 +81,6 @@ env.Benchmark(
 )
 
 env.Library(
-    target='concurrency',
-    source=[
-        'barrier.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-    ],
-)
-
-env.Library(
     target='task_executor_proxy',
     source=[
         'task_executor_proxy.cpp',
diff --git a/src/mongo/util/concurrency/SConscript b/src/mongo/util/concurrency/SConscript
index 5383653ac7b..05862f057aa 100644
--- a/src/mongo/util/concurrency/SConscript
+++ b/src/mongo/util/concurrency/SConscript
@@ -31,7 +31,6 @@ env.CppUnitTest(
     LIBDEPS=[
         'thread_pool',
         'thread_pool_test_fixture',
-        '$BUILD_DIR/mongo/unittest/concurrency',
     ])
 
 env.Library('ticketholder',