From c86905bd4d22f14656b3b058ab0bf4880f3c7258 Mon Sep 17 00:00:00 2001
From: Ian Whalen <ian.whalen@gmail.com>
Date: Thu, 23 Oct 2014 15:11:41 -0400
Subject: Revert "SERVER-15614 LockerImpl changes to support diagnostics and
 deadlock"

This reverts commit 629243d3ec1e0834754574d0dffb59c43d35e85e.
---
 src/mongo/db/concurrency/d_concurrency_test.cpp | 34 ++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/mongo/db/concurrency/d_concurrency_test.cpp')

diff --git a/src/mongo/db/concurrency/d_concurrency_test.cpp b/src/mongo/db/concurrency/d_concurrency_test.cpp
index 2dcb13b6956..2e0eee36322 100644
--- a/src/mongo/db/concurrency/d_concurrency_test.cpp
+++ b/src/mongo/db/concurrency/d_concurrency_test.cpp
@@ -41,19 +41,19 @@
 namespace mongo {
 
     TEST(DConcurrency, GlobalRead) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
         Lock::GlobalRead globalRead(&ls);
         ASSERT(ls.isR());
     }
 
     TEST(DConcurrency, GlobalWrite) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
         Lock::GlobalWrite globalWrite(&ls);
         ASSERT(ls.isW());
     }
 
     TEST(DConcurrency, GlobalWriteAndGlobalRead) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
 
         Lock::GlobalWrite globalWrite(&ls);
         ASSERT(ls.isW());
@@ -67,35 +67,35 @@ namespace mongo {
     }
 
     TEST(DConcurrency, readlocktryTimeout) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
         writelocktry globalWrite(&ls, 0);
         ASSERT(globalWrite.got());
 
         {
-            LockerImpl<true> lsTry(2);
+            LockerImpl<true> lsTry;
             readlocktry lockTry(&lsTry, 1);
             ASSERT(!lockTry.got());
         }
     }
 
     TEST(DConcurrency, writelocktryTimeout) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
         writelocktry globalWrite(&ls, 0);
         ASSERT(globalWrite.got());
 
         {
-            LockerImpl<true> lsTry(2);
+            LockerImpl<true> lsTry;
             writelocktry lockTry(&lsTry, 1);
             ASSERT(!lockTry.got());
         }
     }
 
     TEST(DConcurrency, readlocktryTimeoutDueToFlushLock) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
         AutoAcquireFlushLockForMMAPV1Commit autoFlushLock(&ls);
 
         {
-            LockerImpl<true> lsTry(2);
+            LockerImpl<true> lsTry;
             readlocktry lockTry(&lsTry, 1);
 
             ASSERT(!lockTry.got());
@@ -103,18 +103,18 @@ namespace mongo {
     }
 
     TEST(DConcurrency, writelocktryTimeoutDueToFlushLock) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
         AutoAcquireFlushLockForMMAPV1Commit autoFlushLock(&ls);
 
         {
-            LockerImpl<true> lsTry(2);
+            LockerImpl<true> lsTry;
             writelocktry lockTry(&lsTry, 1);
             ASSERT(!lockTry.got());
         }
     }
 
     TEST(DConcurrency, TempReleaseGlobalWrite) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
         Lock::GlobalWrite globalWrite(&ls);
 
         {
@@ -126,7 +126,7 @@ namespace mongo {
     }
 
     TEST(DConcurrency, DBReadTakesS) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
 
         Lock::DBRead dbRead(&ls, "db");
 
@@ -135,7 +135,7 @@ namespace mongo {
     }
 
     TEST(DConcurrency, DBLockTakesX) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
 
         Lock::DBLock dbWrite(&ls, "db", MODE_X);
 
@@ -144,7 +144,7 @@ namespace mongo {
     }
 
     TEST(DConcurrency, MultipleWriteDBLocksOnSameThread) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
 
         Lock::DBLock r1(&ls, "db1", MODE_X);
         Lock::DBLock r2(&ls, "db1", MODE_X);
@@ -153,7 +153,7 @@ namespace mongo {
     }
 
     TEST(DConcurrency, MultipleConflictingDBLocksOnSameThread) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
 
         Lock::DBLock r1(&ls, "db1", MODE_X);
         Lock::DBRead r2(&ls, "db1");
@@ -162,7 +162,7 @@ namespace mongo {
     }
 
     TEST(DConcurrency, IntentCollectionLock) {
-        LockerImpl<true> ls(1);
+        LockerImpl<true> ls;
 
         const std::string ns("db1.coll");
         const ResourceId id(RESOURCE_COLLECTION, ns);
-- 
cgit v1.2.1