SERVER-17039 Re-add db.currentOp locking stats

This reintroduces the per-operation locking statistics.

Also reverts commit 9b1392162e0f7564cfc3b1634ab78ec1a7f7c871.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/db/operation_context_impl.cpp b/src/mongo/db/operation_context_impl.cpp
index be86fb419c8..6d95e494d5d 100644
--- a/src/mongo/db/operation_context_impl.cpp
+++ b/src/mongo/db/operation_context_impl.cpp
@@ -50,15 +50,17 @@ namespace mongo {
     OperationContextImpl::OperationContextImpl()
         : _client(currentClient.get()),
           _locker(_client->getLocker()) {
+
         invariant(_locker);
+
         StorageEngine* storageEngine = getGlobalEnvironment()->getGlobalStorageEngine();
-        invariant(storageEngine);
         _recovery.reset(storageEngine->newRecoveryUnit());
+
         _client->setOperationContext(this);
     }
 
     OperationContextImpl::~OperationContextImpl() {
-        _locker->assertEmpty();
+        _locker->assertEmptyAndReset();
         _client->resetOperationContext();
     }