SERVER-14462 Clean usages of LockStat from CurOp and Client

Lock statistics will be obtained from the operation context.

3 files changed, 2 insertions, 9 deletions

diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index 496dbae6cae..766a2c130b3 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -313,6 +313,8 @@ namespace mongo {
         if (_connectionId) {
             builder.appendNumber("connectionId", _connectionId);
         }
+
+        _curOp->reportState(&builder);
     }
 
     string Client::clientAddress(bool includePort) const {
@@ -468,7 +470,6 @@ namespace mongo {
         s << " numYields:" << curop.numYields();
         
         s << " ";
-        curop.lockStat().report( s );
         
         OPDEBUG_TOSTRING_HELP( nreturned );
         if ( responseLength > 0 )
@@ -551,7 +552,6 @@ namespace mongo {
         OPDEBUG_APPEND_NUMBER( keyUpdates );
 
         b.appendNumber( "numYield" , curop.numYields() );
-        b.append( "lockStats" , curop.lockStat().report() );
 
         if ( ! exceptionInfo.empty() )
             exceptionInfo.append( b , "exception" , "exceptionCode" );
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 1ee7ee5c10b..19c716603e9 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -81,7 +81,6 @@ namespace mongo {
         _killPending.store(0);
         _numYields = 0;
         _expectedLatencyMs = 0;
-        _lockStat.reset();
     }
 
     void CurOp::reset() {
@@ -208,7 +207,6 @@ namespace mongo {
             builder->append("killPending", true);
 
         builder->append( "numYields" , _numYields );
-        builder->append( "lockStats" , _lockStat.report() );
     }
 
     BSONObj CurOp::description() {
diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h
index d659a0b7a1b..d440b0a97ab 100644
--- a/src/mongo/db/curop.h
+++ b/src/mongo/db/curop.h
@@ -32,7 +32,6 @@
 #pragma once
 
 #include "mongo/db/client.h"
-#include "mongo/db/concurrency/lock_stat.h"
 #include "mongo/db/server_options.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/util/concurrency/spin_lock.h"
@@ -315,9 +314,6 @@ namespace mongo {
         void setExpectedLatencyMs( long long latency ) { _expectedLatencyMs = latency; }
 
         void recordGlobalTime(bool isWriteLocked, long long micros) const;
-        
-        const LockStat& lockStat() const { return _lockStat; }
-        LockStat& lockStat() { return _lockStat; }
 
         /**
          * this should be used very sparingly
@@ -350,7 +346,6 @@ namespace mongo {
         ProgressMeter _progressMeter;
         AtomicInt32 _killPending;
         int _numYields;
-        LockStat _lockStat;
         
         // this is how much "extra" time a query might take
         // a writebacklisten for example will block for 30s