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

Also performs some cleanup of the includes around locking.
CheRuisiBesares · Aug 13, 2014 · c610cfe · c610cfe
1 parent 2fd6a44
commit c610cfe
Show file tree

Hide file tree

Showing 35 changed files with 41 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → src/mongo/db/concurrency/d_concurrency.cpp b/src/mongo/db/d_concurrency.cpp → 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 → src/mongo/db/concurrency/d_concurrency.h b/src/mongo/db/d_concurrency.h → 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 → src/mongo/db/concurrency/lock_stat.cpp b/src/mongo/db/lockstat.cpp → 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 → src/mongo/db/concurrency/lock_stat.h b/src/mongo/db/lockstat.h → 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 → src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/lockstate.cpp → 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 → src/mongo/db/concurrency/lock_state.h b/src/mongo/db/lockstate.h → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"