summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/locker.h
diff options
context:
space:
mode:
authorGeert Bosch <geert@mongodb.com>2018-11-14 11:29:24 -0500
committerGeert Bosch <geert@mongodb.com>2018-11-16 18:30:48 -0500
commit26ef13f278e4d19319f11e4738e7bb0001a62d93 (patch)
tree2848f3b6a27f4873cd01d1ae1d7ee3a48a96edf7 /src/mongo/db/concurrency/locker.h
parent7448559b243a6f72b0ba8a6f648c6e60dcd939e6 (diff)
downloadmongo-26ef13f278e4d19319f11e4738e7bb0001a62d93.tar.gz
SERVER-37564 Remove unused deadlock detector
Diffstat (limited to 'src/mongo/db/concurrency/locker.h')
-rw-r--r--src/mongo/db/concurrency/locker.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mongo/db/concurrency/locker.h b/src/mongo/db/concurrency/locker.h
index 03b4d871c5c..d347e3d4cc2 100644
--- a/src/mongo/db/concurrency/locker.h
+++ b/src/mongo/db/concurrency/locker.h
@@ -222,26 +222,19 @@ public:
* returning LOCK_TIMEOUT. This parameter defaults to an infinite deadline.
* If Milliseconds(0) is passed, the request will return immediately, if
* the request could not be granted right away.
- * @param checkDeadlock Whether to enable deadlock detection for this acquisition. This
- * parameter is put in place until we can handle deadlocks at all places,
- * which acquire locks.
*
* @return All LockResults except for LOCK_WAITING, because it blocks.
*/
virtual LockResult lock(OperationContext* opCtx,
ResourceId resId,
LockMode mode,
- Date_t deadline = Date_t::max(),
- bool checkDeadlock = false) = 0;
+ Date_t deadline = Date_t::max()) = 0;
/**
* Calling lock without an OperationContext does not allow LOCK_WAITING states to be
* interrupted.
*/
- virtual LockResult lock(ResourceId resId,
- LockMode mode,
- Date_t deadline = Date_t::max(),
- bool checkDeadlock = false) = 0;
+ virtual LockResult lock(ResourceId resId, LockMode mode, Date_t deadline = Date_t::max()) = 0;
/**
* Downgrades the specified resource's lock mode without changing the reference count.