diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-10-10 08:54:46 -0400 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-10-10 11:49:21 -0400 |
commit | c868a14dfa6d1a926f38795a1273a7146cef6e77 (patch) | |
tree | 386d352dbb9b5bb46cd172246a686346dae3e6cf /src/mongo/db/concurrency/d_concurrency_test.cpp | |
parent | fd09fb0f37c24c99d6c6b605702d580ace6a4250 (diff) | |
download | mongo-c868a14dfa6d1a926f38795a1273a7146cef6e77.tar.gz |
SERVER-14425 Move LockManager out of the newlm namespace
Diffstat (limited to 'src/mongo/db/concurrency/d_concurrency_test.cpp')
-rw-r--r-- | src/mongo/db/concurrency/d_concurrency_test.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/mongo/db/concurrency/d_concurrency_test.cpp b/src/mongo/db/concurrency/d_concurrency_test.cpp index ddc59b17bd7..f930529fcbe 100644 --- a/src/mongo/db/concurrency/d_concurrency_test.cpp +++ b/src/mongo/db/concurrency/d_concurrency_test.cpp @@ -92,18 +92,19 @@ namespace mongo { TEST(DConcurrency, readlocktryTimeoutDueToFlushLock) { LockState ls; - newlm::AutoAcquireFlushLockForMMAPV1Commit autoFlushLock(&ls); + AutoAcquireFlushLockForMMAPV1Commit autoFlushLock(&ls); { LockState lsTry; readlocktry lockTry(&lsTry, 1); + ASSERT(!lockTry.got()); } } TEST(DConcurrency, writelocktryTimeoutDueToFlushLock) { LockState ls; - newlm::AutoAcquireFlushLockForMMAPV1Commit autoFlushLock(&ls); + AutoAcquireFlushLockForMMAPV1Commit autoFlushLock(&ls); { LockState lsTry; @@ -129,24 +130,24 @@ namespace mongo { Lock::DBRead dbRead(&ls, "db"); - const newlm::ResourceId resIdDb(newlm::RESOURCE_DATABASE, string("db")); - ASSERT(ls.getLockMode(resIdDb) == newlm::MODE_S); + const ResourceId resIdDb(RESOURCE_DATABASE, string("db")); + ASSERT(ls.getLockMode(resIdDb) == MODE_S); } TEST(DConcurrency, DBLockTakesX) { LockState ls; - Lock::DBLock dbWrite(&ls, "db", newlm::MODE_X); + Lock::DBLock dbWrite(&ls, "db", MODE_X); - const newlm::ResourceId resIdDb(newlm::RESOURCE_DATABASE, string("db")); - ASSERT(ls.getLockMode(resIdDb) == newlm::MODE_X); + const ResourceId resIdDb(RESOURCE_DATABASE, string("db")); + ASSERT(ls.getLockMode(resIdDb) == MODE_X); } TEST(DConcurrency, MultipleWriteDBLocksOnSameThread) { LockState ls; - Lock::DBLock r1(&ls, "db1", newlm::MODE_X); - Lock::DBLock r2(&ls, "db1", newlm::MODE_X); + Lock::DBLock r1(&ls, "db1", MODE_X); + Lock::DBLock r2(&ls, "db1", MODE_X); ASSERT(ls.isWriteLocked("db1")); } @@ -154,7 +155,7 @@ namespace mongo { TEST(DConcurrency, MultipleConflictingDBLocksOnSameThread) { LockState ls; - Lock::DBLock r1(&ls, "db1", newlm::MODE_X); + Lock::DBLock r1(&ls, "db1", MODE_X); Lock::DBRead r2(&ls, "db1"); ASSERT(ls.isWriteLocked("db1")); @@ -163,12 +164,12 @@ namespace mongo { TEST(DConcurrenty, IntentCollectionLock) { LockState ls; const std::string ns("db1.coll"); - const newlm::ResourceId id(newlm::RESOURCE_COLLECTION, ns); - Lock::DBLock r1(&ls, "db1", newlm::MODE_X); + const ResourceId id(RESOURCE_COLLECTION, ns); + Lock::DBLock r1(&ls, "db1", MODE_X); { - Lock::CollectionLock r2(&ls, ns, newlm::MODE_S); + Lock::CollectionLock r2(&ls, ns, MODE_S); ASSERT(ls.isAtLeastReadLocked(ns)); } - ASSERT(ls.getLockMode(id) == newlm::MODE_NONE); + ASSERT(ls.getLockMode(id) == MODE_NONE); } } // namespace mongo |