diff options
author | Geert Bosch <geert@mongodb.com> | 2014-12-08 15:57:58 -0500 |
---|---|---|
committer | Geert Bosch <geert@mongodb.com> | 2014-12-16 12:26:05 -0500 |
commit | bc64649a70fe366c46ffab601fc378dbc4286e1c (patch) | |
tree | 95bfde312b2fe6f3cd053a580a9fb61689221160 | |
parent | 98a27c300434ce21c5a0c29d7bd3304964cf0063 (diff) | |
download | mongo-bc64649a70fe366c46ffab601fc378dbc4286e1c.tar.gz |
SERVER-14668: Rename lock_mgr_new to lock_manager
16 files changed, 19 insertions, 19 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index e50cf8b9f16..d4e2d393784 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -911,7 +911,7 @@ serveronlyLibdeps = ["coreshard", "db/auth/authmongod", "db/fts/ftsmongod", "db/common", - "db/concurrency/lock_mgr", + "db/concurrency/lock_manager", "db/concurrency/write_conflict_exception", "db/ops/update_driver", "defaultversion", diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index 145f0dde257..9ff84ca730d 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -13,10 +13,10 @@ env.Library( ) env.Library( - target='lock_mgr', + target='lock_manager', source=[ 'd_concurrency.cpp', - 'lock_mgr_new.cpp', + 'lock_manager.cpp', 'lock_state.cpp', ], LIBDEPS=[ @@ -30,14 +30,14 @@ env.Library( ) env.CppUnitTest( - target='lock_mgr_test', + target='lock_manager_test', source=['d_concurrency_test.cpp', 'deadlock_detection_test.cpp', 'fast_map_noalloc_test.cpp', - 'lock_mgr_new_test.cpp', + 'lock_manager_test.cpp', 'lock_state_test.cpp', ], LIBDEPS=[ - 'lock_mgr' + 'lock_manager' ] ) diff --git a/src/mongo/db/concurrency/d_concurrency_test.cpp b/src/mongo/db/concurrency/d_concurrency_test.cpp index d6e65360ef4..34a780b4afa 100644 --- a/src/mongo/db/concurrency/d_concurrency_test.cpp +++ b/src/mongo/db/concurrency/d_concurrency_test.cpp @@ -31,7 +31,7 @@ #include <string> #include "mongo/db/concurrency/d_concurrency.h" -#include "mongo/db/concurrency/lock_mgr_test_help.h" +#include "mongo/db/concurrency/lock_manager_test_help.h" #include "mongo/unittest/unittest.h" namespace mongo { diff --git a/src/mongo/db/concurrency/deadlock_detection_test.cpp b/src/mongo/db/concurrency/deadlock_detection_test.cpp index 526405d9cdb..9d05f350eb7 100644 --- a/src/mongo/db/concurrency/deadlock_detection_test.cpp +++ b/src/mongo/db/concurrency/deadlock_detection_test.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#include "mongo/db/concurrency/lock_mgr_test_help.h" +#include "mongo/db/concurrency/lock_manager_test_help.h" #include "mongo/unittest/unittest.h" namespace mongo { diff --git a/src/mongo/db/concurrency/fast_map_noalloc_test.cpp b/src/mongo/db/concurrency/fast_map_noalloc_test.cpp index bb20e0c6a05..70810cb6b5a 100644 --- a/src/mongo/db/concurrency/fast_map_noalloc_test.cpp +++ b/src/mongo/db/concurrency/fast_map_noalloc_test.cpp @@ -30,7 +30,7 @@ #include <string> #include "mongo/db/concurrency/fast_map_noalloc.h" -#include "mongo/db/concurrency/lock_mgr_defs.h" +#include "mongo/db/concurrency/lock_manager_defs.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/concurrency/lock_mgr_new.cpp b/src/mongo/db/concurrency/lock_manager.cpp index 887461167ef..8dfcfc76e9c 100644 --- a/src/mongo/db/concurrency/lock_mgr_new.cpp +++ b/src/mongo/db/concurrency/lock_manager.cpp @@ -32,7 +32,7 @@ #include "mongo/platform/basic.h" -#include "mongo/db/concurrency/lock_mgr_new.h" +#include "mongo/db/concurrency/lock_manager.h" #include "mongo/db/concurrency/locker.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/concurrency/lock_mgr_new.h b/src/mongo/db/concurrency/lock_manager.h index cbba7d81f15..141455a046a 100644 --- a/src/mongo/db/concurrency/lock_mgr_new.h +++ b/src/mongo/db/concurrency/lock_manager.h @@ -33,7 +33,7 @@ #include <deque> -#include "mongo/db/concurrency/lock_mgr_defs.h" +#include "mongo/db/concurrency/lock_manager_defs.h" #include "mongo/db/concurrency/lock_request_list.h" #include "mongo/platform/atomic_word.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/concurrency/lock_mgr_defs.h b/src/mongo/db/concurrency/lock_manager_defs.h index 7c93ee55dbd..7c93ee55dbd 100644 --- a/src/mongo/db/concurrency/lock_mgr_defs.h +++ b/src/mongo/db/concurrency/lock_manager_defs.h diff --git a/src/mongo/db/concurrency/lock_mgr_new_test.cpp b/src/mongo/db/concurrency/lock_manager_test.cpp index e540321beea..9195e5c0423 100644 --- a/src/mongo/db/concurrency/lock_mgr_new_test.cpp +++ b/src/mongo/db/concurrency/lock_manager_test.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#include "mongo/db/concurrency/lock_mgr_test_help.h" +#include "mongo/db/concurrency/lock_manager_test_help.h" #include "mongo/unittest/unittest.h" namespace mongo { diff --git a/src/mongo/db/concurrency/lock_mgr_test_help.h b/src/mongo/db/concurrency/lock_manager_test_help.h index 24d4a6c7844..e76b5e51606 100644 --- a/src/mongo/db/concurrency/lock_mgr_test_help.h +++ b/src/mongo/db/concurrency/lock_manager_test_help.h @@ -28,7 +28,7 @@ #pragma once -#include "mongo/db/concurrency/lock_mgr_new.h" +#include "mongo/db/concurrency/lock_manager.h" #include "mongo/db/concurrency/lock_state.h" namespace mongo { diff --git a/src/mongo/db/concurrency/lock_request_list.h b/src/mongo/db/concurrency/lock_request_list.h index 082e924f7e0..066a09dcd98 100644 --- a/src/mongo/db/concurrency/lock_request_list.h +++ b/src/mongo/db/concurrency/lock_request_list.h @@ -28,7 +28,7 @@ #pragma once -#include "mongo/db/concurrency/lock_mgr_defs.h" +#include "mongo/db/concurrency/lock_manager_defs.h" #include "mongo/util/assert_util.h" namespace mongo { diff --git a/src/mongo/db/concurrency/lock_state_test.cpp b/src/mongo/db/concurrency/lock_state_test.cpp index d2d11abac3e..04bfc4c8286 100644 --- a/src/mongo/db/concurrency/lock_state_test.cpp +++ b/src/mongo/db/concurrency/lock_state_test.cpp @@ -32,7 +32,7 @@ #include <vector> -#include "mongo/db/concurrency/lock_mgr_test_help.h" +#include "mongo/db/concurrency/lock_manager_test_help.h" #include "mongo/unittest/unittest.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/concurrency/locker.h b/src/mongo/db/concurrency/locker.h index 94caf497c7c..ad79a9e0b6f 100644 --- a/src/mongo/db/concurrency/locker.h +++ b/src/mongo/db/concurrency/locker.h @@ -33,7 +33,7 @@ #include "mongo/base/disallow_copying.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/concurrency/lock_mgr_new.h" +#include "mongo/db/concurrency/lock_manager.h" namespace mongo { diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index 523a7ed1fc6..aa0183617a2 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -166,7 +166,7 @@ env.Library('replmocks', 'repl_coordinator_mock.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/concurrency/lock_mgr', + '$BUILD_DIR/mongo/db/concurrency/lock_manager', 'repl_coordinator_interface', 'replication_executor', ]) diff --git a/src/mongo/db/storage/kv/SConscript b/src/mongo/db/storage/kv/SConscript index 0c3f838d833..5ad971933fd 100644 --- a/src/mongo/db/storage/kv/SConscript +++ b/src/mongo/db/storage/kv/SConscript @@ -7,7 +7,7 @@ env.Library( 'kv_collection_catalog_entry.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/concurrency/lock_mgr', + '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry', ] ) diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h index 2c9d51a579e..cc8f13fa50d 100644 --- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h +++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h @@ -36,7 +36,7 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" -#include "mongo/db/concurrency/lock_mgr_defs.h" +#include "mongo/db/concurrency/lock_manager_defs.h" #include "mongo/db/storage/mmap_v1/diskloc.h" #include "mongo/db/storage/mmap_v1/extent_manager.h" #include "mongo/db/storage/mmap_v1/record_access_tracker.h" |