summaryrefslogtreecommitdiff
path: root/src/mongo/db/curop.cpp
diff options
context:
space:
mode:
authorTyler Brock <tyler.brock@gmail.com>2014-06-30 15:08:13 -0400
committerTyler Brock <tyler.brock@gmail.com>2014-06-30 15:08:13 -0400
commita353e16805d573af3d5ab4d32fbda87ec98d5c40 (patch)
treeb380194417fd18d7ac24a138cf8a3f14f2535e0c /src/mongo/db/curop.cpp
parente9a6e9365cf4d6d13b4a3f94aec1f433dab9f704 (diff)
downloadmongo-a353e16805d573af3d5ab4d32fbda87ec98d5c40.tar.gz
Revert "SERVER-13961 Add OperationContext argument to Client::Context"
This reverts commit e1f5a39b1b625d04752be13f39c774e579b64cd8.
Diffstat (limited to 'src/mongo/db/curop.cpp')
-rw-r--r--src/mongo/db/curop.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 2f968ca4979..178166402d3 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -158,8 +158,12 @@ namespace mongo {
_dbprofile = std::max( context->_db ? context->_db->getProfilingLevel() : 0 , _dbprofile );
}
- void CurOp::recordGlobalTime(bool isWriteLocked, long long micros) const {
- Top::global.record(_ns, _op, isWriteLocked ? 1 : -1, micros, _isCommand);
+ void CurOp::recordGlobalTime( long long micros ) const {
+ if ( _client ) {
+ const LockState& ls = _client->lockState();
+ verify( ls.threadState() );
+ Top::global.record( _ns , _op , ls.isWriteLocked() ? 1 : -1 , micros , _isCommand );
+ }
}
void CurOp::reportState(BSONObjBuilder* builder) {