SERVER-16431 Remove recursive() and recursiveCount() from Locker

Not used anywhere.

3 files changed, 1 insertions, 17 deletions

diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp
index 552b1261e2c..a80a2a966a4 100644
--- a/src/mongo/db/concurrency/lock_state.cpp
+++ b/src/mongo/db/concurrency/lock_state.cpp
@@ -188,11 +188,6 @@ namespace {
     }
 
     template<bool IsForMMAPV1>
-    bool LockerImpl<IsForMMAPV1>::isRecursive() const {
-        return recursiveCount() > 1;
-    }
-
-    template<bool IsForMMAPV1>
     void LockerImpl<IsForMMAPV1>::assertWriteLocked(const StringData& ns) const {
         if (!isWriteLocked(ns)) {
             dump();
@@ -270,8 +265,7 @@ namespace {
         : _id(id),
           _wuowNestingLevel(0),
           _batchWriter(false),
-          _lockPendingParallelWriter(false),
-          _recursive(0) {
+          _lockPendingParallelWriter(false) {
 
     }
 
diff --git a/src/mongo/db/concurrency/lock_state.h b/src/mongo/db/concurrency/lock_state.h
index 90f3cb0d717..d034b158e8b 100644
--- a/src/mongo/db/concurrency/lock_state.h
+++ b/src/mongo/db/concurrency/lock_state.h
@@ -211,8 +211,6 @@ namespace mongo {
 
         virtual void dump() const;
 
-        virtual unsigned recursiveCount() const { return _recursive; }
-
         virtual bool isW() const;
         virtual bool isR() const;
         virtual bool hasAnyReadLock() const;
@@ -220,7 +218,6 @@ namespace mongo {
         virtual bool isLocked() const;
         virtual bool isWriteLocked() const;
         virtual bool isWriteLocked(const StringData& ns) const;
-        virtual bool isRecursive() const;
 
         virtual void assertWriteLocked(const StringData& ns) const;
 
@@ -236,8 +233,6 @@ namespace mongo {
 
         bool _batchWriter;
         bool _lockPendingParallelWriter;
-
-        unsigned _recursive;           // we allow recursively asking for a lock; we track that here
     };
 
     typedef LockerImpl<false> DefaultLockerImpl;
diff --git a/src/mongo/db/concurrency/locker.h b/src/mongo/db/concurrency/locker.h
index 04e5ce2c929..fff17db48ef 100644
--- a/src/mongo/db/concurrency/locker.h
+++ b/src/mongo/db/concurrency/locker.h
@@ -251,8 +251,6 @@ namespace mongo {
 
         virtual void dump() const = 0;
 
-        virtual unsigned recursiveCount() const = 0;
-
         virtual bool isW() const = 0;
         virtual bool isR() const = 0;
         virtual bool hasAnyReadLock() const = 0; // explicitly r or R
@@ -261,9 +259,6 @@ namespace mongo {
         virtual bool isWriteLocked() const = 0;
         virtual bool isWriteLocked(const StringData& ns) const = 0;
         
-
-        virtual bool isRecursive() const = 0;
-
         virtual void assertWriteLocked(const StringData& ns) const = 0;
 
         /**