SERVER-14668 Move locking related files to be under mongo/db/concurrency

Also performs some cleanup of the includes around locking.

35 files changed, 41 insertions, 48 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 036a96c7d08..c3945e2b154 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -562,9 +562,6 @@ serverOnlyFiles = [ "db/curop.cpp",
                     "db/d_globals.cpp",
                     "util/compress.cpp",
                     "db/ttl.cpp",
-                    "db/d_concurrency.cpp",
-                    "db/lockstat.cpp",
-                    "db/lockstate.cpp",
                     "util/logfile.cpp",
                     "util/alignedbuilder.cpp",
                     "util/elapsed_tracker.cpp",
diff --git a/src/mongo/db/auth/authz_session_external_state_d.cpp b/src/mongo/db/auth/authz_session_external_state_d.cpp
index a24f11bedab..c7d289f7fc2 100644
--- a/src/mongo/db/auth/authz_session_external_state_d.cpp
+++ b/src/mongo/db/auth/authz_session_external_state_d.cpp
@@ -33,7 +33,7 @@
 #include "mongo/db/auth/authorization_manager.h"
 #include "mongo/db/client.h"
 #include "mongo/db/dbhelpers.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/instance.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/scripting/engine.h"
diff --git a/src/mongo/db/catalog/collection_info_cache.cpp b/src/mongo/db/catalog/collection_info_cache.cpp
index 63bf44e80db..f0482cad178 100644
--- a/src/mongo/db/catalog/collection_info_cache.cpp
+++ b/src/mongo/db/catalog/collection_info_cache.cpp
@@ -35,7 +35,7 @@
 #include "mongo/db/catalog/collection_info_cache.h"
 
 #include "mongo/db/catalog/collection.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/fts/fts_spec.h"
 #include "mongo/db/index/index_descriptor.h"
 #include "mongo/db/index_legacy.h"
diff --git a/src/mongo/db/catalog/database_holder.cpp b/src/mongo/db/catalog/database_holder.cpp
index 12ee303a6e8..fa12613c662 100644
--- a/src/mongo/db/catalog/database_holder.cpp
+++ b/src/mongo/db/catalog/database_holder.cpp
@@ -38,7 +38,7 @@
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/catalog/database_catalog_entry.h"
 #include "mongo/db/catalog/database_holder.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/global_environment_experiment.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/db/storage/mmap_v1/dur.h"
diff --git a/src/mongo/db/catalog/database_holder.h b/src/mongo/db/catalog/database_holder.h
index bd3b3cd0133..1d067af7c00 100644
--- a/src/mongo/db/catalog/database_holder.h
+++ b/src/mongo/db/catalog/database_holder.h
@@ -32,7 +32,7 @@
 
 #include "mongo/base/string_data.h"
 #include "mongo/db/catalog/database.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/util/string_map.h"
 
diff --git a/src/mongo/db/client.h b/src/mongo/db/client.h
index 65b72b09dc1..72c290af3c6 100644
--- a/src/mongo/db/client.h
+++ b/src/mongo/db/client.h
@@ -37,7 +37,7 @@
 #pragma once
 
 #include "mongo/db/client_basic.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/lasterror.h"
 #include "mongo/db/repl/rs.h"
 #include "mongo/db/stats/top.h"
diff --git a/src/mongo/db/commands/compact.cpp b/src/mongo/db/commands/compact.cpp
index a31b84cf1b9..0ec15bcc8c3 100644
--- a/src/mongo/db/commands/compact.cpp
+++ b/src/mongo/db/commands/compact.cpp
@@ -39,7 +39,7 @@
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/curop.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/index_builder.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/operation_context_impl.h"
diff --git a/src/mongo/db/commands/fsync.cpp b/src/mongo/db/commands/fsync.cpp
index df304429935..8822269a43f 100644
--- a/src/mongo/db/commands/fsync.cpp
+++ b/src/mongo/db/commands/fsync.cpp
@@ -39,7 +39,7 @@
 #include "mongo/db/auth/action_type.h"
 #include "mongo/db/auth/authorization_manager.h"
 #include "mongo/db/auth/privilege.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/global_environment_experiment.h"
 #include "mongo/db/storage/mmap_v1/dur.h"
diff --git a/src/mongo/db/commands/touch.cpp b/src/mongo/db/commands/touch.cpp
index e5ca59c652a..187ba27ab04 100644
--- a/src/mongo/db/commands/touch.cpp
+++ b/src/mongo/db/commands/touch.cpp
@@ -43,7 +43,7 @@
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/curop.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/util/timer.h"
diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript
index 97507d58197..1dd9355c81f 100644
--- a/src/mongo/db/concurrency/SConscript
+++ b/src/mongo/db/concurrency/SConscript
@@ -6,6 +6,9 @@ env.Library(
     target='lock_mgr',
     source=[
         'lock_mgr.cpp',
+        'd_concurrency.cpp',
+        'lock_stat.cpp',
+        'lock_state.cpp'
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base/base',
diff --git a/src/mongo/db/d_concurrency.cpp b/src/mongo/db/concurrency/d_concurrency.cpp
index 2c7fcffd4ea..f331af72ec5 100644
--- a/src/mongo/db/d_concurrency.cpp
+++ b/src/mongo/db/concurrency/d_concurrency.cpp
@@ -30,23 +30,18 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 
-#include "mongo/db/client.h"
 #include "mongo/db/commands/server_status.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/d_globals.h"
 #include "mongo/db/global_environment_experiment.h"
-#include "mongo/db/lockstat.h"
-#include "mongo/db/namespace_string.h"
+#include "mongo/db/concurrency/lock_stat.h"
 #include "mongo/db/server_parameters.h"
 #include "mongo/db/operation_context.h"
-#include "mongo/server.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/concurrency/mapsf.h"
 #include "mongo/util/concurrency/qlock.h"
-#include "mongo/util/concurrency/rwlock.h"
-#include "mongo/util/concurrency/threadlocal.h"
 #include "mongo/util/log.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/stacktrace.h"
diff --git a/src/mongo/db/d_concurrency.h b/src/mongo/db/concurrency/d_concurrency.h
index 7a93b0936ae..03940bb13a8 100644
--- a/src/mongo/db/d_concurrency.h
+++ b/src/mongo/db/concurrency/d_concurrency.h
@@ -36,7 +36,7 @@
 
 #include "mongo/base/string_data.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/db/lockstat.h"
+#include "mongo/db/concurrency/lock_stat.h"
 #include "mongo/util/concurrency/mutex.h"
 #include "mongo/util/concurrency/rwlock.h"
 
diff --git a/src/mongo/db/lockstat.cpp b/src/mongo/db/concurrency/lock_stat.cpp
index 30e3b901792..7a6b3355231 100644
--- a/src/mongo/db/lockstat.cpp
+++ b/src/mongo/db/concurrency/lock_stat.cpp
@@ -1,4 +1,4 @@
-// lockstat.cpp
+// lock_stat.cpp
 
 /**
 *    Copyright (C) 2008 10gen Inc.
@@ -29,9 +29,9 @@
 */
 
 
-#include "mongo/pch.h"
+#include "mongo/platform/basic.h"
 
-#include "mongo/db/lockstat.h"
+#include "mongo/db/concurrency/lock_stat.h"
 
 #include "mongo/db/jsobj.h"
 
diff --git a/src/mongo/db/lockstat.h b/src/mongo/db/concurrency/lock_stat.h
index 82b24e3c004..9407ba2df1a 100644
--- a/src/mongo/db/lockstat.h
+++ b/src/mongo/db/concurrency/lock_stat.h
@@ -1,4 +1,4 @@
-// lockstat.h
+// lock_stat.h
 
 /**
 *    Copyright (C) 2008 10gen Inc.
diff --git a/src/mongo/db/lockstate.cpp b/src/mongo/db/concurrency/lock_state.cpp
index 3e5744703f7..4abadea64c1 100644
--- a/src/mongo/db/lockstate.cpp
+++ b/src/mongo/db/concurrency/lock_state.cpp
@@ -28,7 +28,7 @@
 *    it in the license file.
 */
 
-#include "mongo/db/lockstate.h"
+#include "mongo/db/concurrency/lock_state.h"
 
 #include "mongo/db/namespace_string.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/db/lockstate.h b/src/mongo/db/concurrency/lock_state.h
index 7f484c592a6..adc1716faa7 100644
--- a/src/mongo/db/lockstate.h
+++ b/src/mongo/db/concurrency/lock_state.h
@@ -1,4 +1,4 @@
-// lockstate.h
+// lock_state.h
 
 /**
 *    Copyright (C) 2008 10gen Inc.
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
+
 
 namespace mongo {
 
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 45b3dff01c2..9fc531a5e7c 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -51,7 +51,7 @@
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/commands/server_status.h"
 #include "mongo/db/commands/server_status_metric.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/d_globals.h"
 #include "mongo/db/db.h"
 #include "mongo/db/dbmessage.h"
diff --git a/src/mongo/db/index_builder.cpp b/src/mongo/db/index_builder.cpp
index 14b153f098f..5398c5f3b5c 100644
--- a/src/mongo/db/index_builder.cpp
+++ b/src/mongo/db/index_builder.cpp
@@ -36,7 +36,7 @@
 #include "mongo/db/curop.h"
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/catalog/database_holder.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/repl/rs.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index 6c097791b8c..a7073da73e7 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -43,7 +43,7 @@
 #include "mongo/db/background.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/commands/fsync.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/db.h"
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/dbmessage.h"
diff --git a/src/mongo/db/operation_context.h b/src/mongo/db/operation_context.h
index 50b0d7736f8..8ca67393a7d 100644
--- a/src/mongo/db/operation_context.h
+++ b/src/mongo/db/operation_context.h
@@ -34,8 +34,8 @@
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/db/storage/recovery_unit.h"
-#include "mongo/db/lockstate.h"
 #include "mongo/db/concurrency/lock_mgr.h"
+#include "mongo/db/concurrency/lock_state.h"
 
 
 namespace mongo {
diff --git a/src/mongo/db/repl/network_interface_impl.cpp b/src/mongo/db/repl/network_interface_impl.cpp
index 57cf6c4a51a..845c63c0abb 100644
--- a/src/mongo/db/repl/network_interface_impl.cpp
+++ b/src/mongo/db/repl/network_interface_impl.cpp
@@ -31,7 +31,7 @@
 #include "mongo/db/repl/network_interface_impl.h"
 
 #include "mongo/client/connpool.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/util/assert_util.h"
 
diff --git a/src/mongo/db/repl/rs_sync.cpp b/src/mongo/db/repl/rs_sync.cpp
index 82ec24381a9..e68edeb1a54 100644
--- a/src/mongo/db/repl/rs_sync.cpp
+++ b/src/mongo/db/repl/rs_sync.cpp
@@ -40,7 +40,7 @@
 #include "mongo/db/commands/fsync.h"
 #include "mongo/db/commands/server_status.h"
 #include "mongo/db/curop.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/prefetch.h"
 #include "mongo/db/repl/bgsync.h"
diff --git a/src/mongo/db/stats/snapshots_webplugins.cpp b/src/mongo/db/stats/snapshots_webplugins.cpp
index 176ccf24ac5..e01065d71f1 100644
--- a/src/mongo/db/stats/snapshots_webplugins.cpp
+++ b/src/mongo/db/stats/snapshots_webplugins.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/dbwebserver.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/stats/snapshots.h"
diff --git a/src/mongo/db/storage/mmap_v1/catalog/namespace_index.cpp b/src/mongo/db/storage/mmap_v1/catalog/namespace_index.cpp
index 795082b26b5..eb72d376e19 100644
--- a/src/mongo/db/storage/mmap_v1/catalog/namespace_index.cpp
+++ b/src/mongo/db/storage/mmap_v1/catalog/namespace_index.cpp
@@ -35,7 +35,7 @@
 
 #include <boost/filesystem/operations.hpp>
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/storage/mmap_v1/catalog/namespace_details.h"
 #include "mongo/util/exit.h"
diff --git a/src/mongo/db/storage/mmap_v1/data_file.cpp b/src/mongo/db/storage/mmap_v1/data_file.cpp
index 521589c6c95..f4426d27b49 100644
--- a/src/mongo/db/storage/mmap_v1/data_file.cpp
+++ b/src/mongo/db/storage/mmap_v1/data_file.cpp
@@ -30,15 +30,14 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kStorage
 
-#include "mongo/pch.h"
+#include "mongo/platform/basic.h"
 
 #include "mongo/db/storage/mmap_v1/data_file.h"
 
 #include <boost/filesystem/operations.hpp>
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/storage/mmap_v1/dur.h"
-#include "mongo/db/lockstate.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/util/file_allocator.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/db/storage/mmap_v1/dur_commitjob.h b/src/mongo/db/storage/mmap_v1/dur_commitjob.h
index 70100499bf1..89a97a5ba3c 100644
--- a/src/mongo/db/storage/mmap_v1/dur_commitjob.h
+++ b/src/mongo/db/storage/mmap_v1/dur_commitjob.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/storage/mmap_v1/dur.h"
 #include "mongo/db/storage/mmap_v1/durop.h"
 #include "mongo/util/alignedbuilder.h"
diff --git a/src/mongo/db/storage/mmap_v1/durable_mapped_file.cpp b/src/mongo/db/storage/mmap_v1/durable_mapped_file.cpp
index b9d6231f8fa..3f23be7188d 100644
--- a/src/mongo/db/storage/mmap_v1/durable_mapped_file.cpp
+++ b/src/mongo/db/storage/mmap_v1/durable_mapped_file.cpp
@@ -39,7 +39,7 @@
 #include "mongo/db/storage/mmap_v1/durable_mapped_file.h"
 
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/storage_options.h"
 #include "mongo/db/storage/mmap_v1/dur.h"
 #include "mongo/db/storage/mmap_v1/dur_journalformat.h"
diff --git a/src/mongo/db/storage/mmap_v1/durop.cpp b/src/mongo/db/storage/mmap_v1/durop.cpp
index 494cd4bca5a..29192362e91 100644
--- a/src/mongo/db/storage/mmap_v1/durop.cpp
+++ b/src/mongo/db/storage/mmap_v1/durop.cpp
@@ -34,7 +34,7 @@
 
 #include "mongo/db/storage/mmap_v1/durop.h"
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/storage/mmap_v1/durable_mapped_file.h"
 #include "mongo/db/storage/mmap_v1/mmap_v1_engine.h"
 #include "mongo/util/alignedbuilder.h"
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
index 3a09d6d4eab..9749bc0bfea 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
@@ -36,7 +36,7 @@
 
 #include "mongo/db/audit.h"
 #include "mongo/db/client.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/storage/mmap_v1/dur.h"
 #include "mongo/db/storage/mmap_v1/data_file.h"
 #include "mongo/db/storage/mmap_v1/record.h"
diff --git a/src/mongo/dbtests/commandtests.cpp b/src/mongo/dbtests/commandtests.cpp
index 955620eac94..364a73fcf84 100644
--- a/src/mongo/dbtests/commandtests.cpp
+++ b/src/mongo/dbtests/commandtests.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/dbtests/dbtests.h"
 
diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp
index 678678bbb87..425409d3848 100644
--- a/src/mongo/dbtests/threadedtests.cpp
+++ b/src/mongo/dbtests/threadedtests.cpp
@@ -35,7 +35,7 @@
 
 #include <boost/thread.hpp>
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/dbtests/dbtests.h"
 #include "mongo/platform/atomic_word.h"
diff --git a/src/mongo/s/d_merge.cpp b/src/mongo/s/d_merge.cpp
index 6a4cb65dfdf..861d932f5c3 100644
--- a/src/mongo/s/d_merge.cpp
+++ b/src/mongo/s/d_merge.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "mongo/base/owned_pointer_vector.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/s/d_logic.h"
diff --git a/src/mongo/s/s_only.cpp b/src/mongo/s/s_only.cpp
index f925d13ce84..ed5aa2568e2 100644
--- a/src/mongo/s/s_only.cpp
+++ b/src/mongo/s/s_only.cpp
@@ -63,8 +63,6 @@ namespace mongo {
 
     TSP_DEFINE(Client,currentClient)
 
-    LockState::LockState(){} // ugh
-
     Client::Client(const string& desc, AbstractMessagingPort *p) :
         ClientBasic(p),
         _shutdown(false),
diff --git a/src/mongo/util/mmap_posix.cpp b/src/mongo/util/mmap_posix.cpp
index 3e0b2d89a5a..52c64249f50 100644
--- a/src/mongo/util/mmap_posix.cpp
+++ b/src/mongo/util/mmap_posix.cpp
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 
 #include "mongo/platform/atomic_word.h"
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/util/file_allocator.h"
 #include "mongo/util/log.h"
 #include "mongo/util/mmap.h"
diff --git a/src/mongo/util/mmap_win.cpp b/src/mongo/util/mmap_win.cpp
index 9865784dc0a..19479cd3452 100644
--- a/src/mongo/util/mmap_win.cpp
+++ b/src/mongo/util/mmap_win.cpp
@@ -29,7 +29,7 @@
 
 #include "mongo/pch.h"
 
-#include "mongo/db/d_concurrency.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/storage/mmap_v1/durable_mapped_file.h"
 #include "mongo/util/file_allocator.h"
 #include "mongo/util/log.h"