diff options
author | Benety Goh <benety@mongodb.com> | 2017-08-16 13:07:53 -0400 |
---|---|---|
committer | Benety Goh <benety@mongodb.com> | 2017-08-28 16:02:53 -0400 |
commit | 95d9bdf1b9250d4beea8182ee907107fc732d216 (patch) | |
tree | aadf47051169af78199f98574ee06e5f9552afcc /src | |
parent | 78862314349a5daeeff213ce22b2d81105e7e5e8 (diff) | |
download | mongo-95d9bdf1b9250d4beea8182ee907107fc732d216.tar.gz |
SERVER-30212 moved test RAII class ForceSupportsDocLocking from d_concurrency_test.cpp to lock_manager_test_help.h
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/concurrency/d_concurrency_test.cpp | 20 | ||||
-rw-r--r-- | src/mongo/db/concurrency/lock_manager_test_help.h | 19 |
2 files changed, 19 insertions, 20 deletions
diff --git a/src/mongo/db/concurrency/d_concurrency_test.cpp b/src/mongo/db/concurrency/d_concurrency_test.cpp index f8dc93fd498..3b012a12e5e 100644 --- a/src/mongo/db/concurrency/d_concurrency_test.cpp +++ b/src/mongo/db/concurrency/d_concurrency_test.cpp @@ -49,9 +49,6 @@ #include "mongo/util/time_support.h" namespace mongo { - -extern bool _supportsDocLocking; - namespace { const int kMaxPerfThreads = 16; // max number of threads to use for lock perf @@ -59,23 +56,6 @@ const int kMaxStressThreads = 32; // max number of threads to use for lock stre const int kMinPerfMillis = 30; // min duration for reliable timing /** - * Temporarily forces setting of the docLockingSupported global for testing purposes. - */ -class ForceSupportsDocLocking { -public: - explicit ForceSupportsDocLocking(bool supported) : _oldSupportsDocLocking(_supportsDocLocking) { - _supportsDocLocking = supported; - } - - ~ForceSupportsDocLocking() { - _supportsDocLocking = _oldSupportsDocLocking; - } - -private: - bool _oldSupportsDocLocking; -}; - -/** * A RAII object that instantiates a TicketHolder that limits number of allowed global lock * acquisitions to numTickets. The opCtx must live as long as the UseGlobalThrottling instance. */ diff --git a/src/mongo/db/concurrency/lock_manager_test_help.h b/src/mongo/db/concurrency/lock_manager_test_help.h index 79de7dcba50..d7c70515fab 100644 --- a/src/mongo/db/concurrency/lock_manager_test_help.h +++ b/src/mongo/db/concurrency/lock_manager_test_help.h @@ -70,4 +70,23 @@ public: } }; +/** + * A RAII object that temporarily forces setting of the _supportsDocLocking global variable (defined + * in db/service_context.cpp and returned by mongo::supportsDocLocking()) for testing purposes. + */ +extern bool _supportsDocLocking; +class ForceSupportsDocLocking { +public: + explicit ForceSupportsDocLocking(bool supported) : _oldSupportsDocLocking(_supportsDocLocking) { + _supportsDocLocking = supported; + } + + ~ForceSupportsDocLocking() { + _supportsDocLocking = _oldSupportsDocLocking; + } + +private: + const bool _oldSupportsDocLocking; +}; + } // namespace mongo |