summaryrefslogtreecommitdiff
path: root/src/mongo/db/operation_context.h
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-09-11 11:12:52 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-09-11 16:10:27 -0400
commitb47b91801021f5125fbcee07bf827b237ad1b4ee (patch)
tree40551bc8f376fee6814d6ee0812d6d1ae35d056b /src/mongo/db/operation_context.h
parent4c429ebe0a44521a293103c8e3b2fb90f14f056e (diff)
downloadmongo-b47b91801021f5125fbcee07bf827b237ad1b4ee.tar.gz
SERVER-14668 Make Locker an interface
Turns the Locker class into an interface and changes most usages of LockState to now be either accesses to this interface or to use the default interface implementation.
Diffstat (limited to 'src/mongo/db/operation_context.h')
-rw-r--r--src/mongo/db/operation_context.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/db/operation_context.h b/src/mongo/db/operation_context.h
index e425b6941ab..b4a0a6c6a49 100644
--- a/src/mongo/db/operation_context.h
+++ b/src/mongo/db/operation_context.h
@@ -34,11 +34,12 @@
#include "mongo/base/status.h"
#include "mongo/base/string_data.h"
#include "mongo/db/storage/recovery_unit.h"
+#include "mongo/db/concurrency/locker.h"
#include "mongo/db/concurrency/lock_mgr.h"
-#include "mongo/db/concurrency/lock_state.h"
namespace mongo {
+
class Client;
class CurOp;
class ProgressMeter;
@@ -63,7 +64,7 @@ namespace mongo {
/**
* Interface for locking. Caller DOES NOT own pointer.
*/
- virtual LockState* lockState() const = 0;
+ virtual Locker* lockState() const = 0;
// --- operation level info? ---