summaryrefslogtreecommitdiff
path: root/src/mongo/db/introspect.cpp
diff options
context:
space:
mode:
authorErnie Hershey <ernie.hershey@10gen.com>2015-05-18 13:51:30 -0400
committerErnie Hershey <ernie.hershey@10gen.com>2015-05-18 13:51:30 -0400
commit7147e127644cba2bfa292945557b43664cc31f47 (patch)
treebcd10aa1950bd7be199de910f0891d9bf2b500f8 /src/mongo/db/introspect.cpp
parentd5bf63455aa614d98ac840f09ce5ca6b813b9507 (diff)
downloadmongo-7147e127644cba2bfa292945557b43664cc31f47.tar.gz
Revert "SERVER-18515 Replace OperationContext::getCurOp with CurOp::get(OperationContext*)"
This reverts commit d5bf63455aa614d98ac840f09ce5ca6b813b9507.
Diffstat (limited to 'src/mongo/db/introspect.cpp')
-rw-r--r--src/mongo/db/introspect.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/introspect.cpp b/src/mongo/db/introspect.cpp
index 1f6e0003e6c..8040a0b7b6b 100644
--- a/src/mongo/db/introspect.cpp
+++ b/src/mongo/db/introspect.cpp
@@ -91,20 +91,20 @@ namespace {
{
Locker::LockerInfo lockerInfo;
txn->lockState()->getLockerInfo(&lockerInfo);
- CurOp::get(txn)->debug().append(*CurOp::get(txn), lockerInfo.stats, b);
+ txn->getCurOp()->debug().append(*txn->getCurOp(), lockerInfo.stats, b);
}
b.appendDate("ts", jsTime());
b.append("client", txn->getClient()->clientAddress());
AuthorizationSession * authSession = AuthorizationSession::get(txn->getClient());
- _appendUserInfo(*CurOp::get(txn), b, authSession);
+ _appendUserInfo(*txn->getCurOp(), b, authSession);
const BSONObj p = b.done();
const bool wasLocked = txn->lockState()->isLocked();
- const string dbName(nsToDatabase(CurOp::get(txn)->getNS()));
+ const string dbName(nsToDatabase(txn->getCurOp()->getNS()));
try {
bool acquireDbXLock = false;
@@ -126,7 +126,7 @@ namespace {
if (!db) {
// Database disappeared
log() << "note: not profiling because db went away for "
- << CurOp::get(txn)->getNS();
+ << txn->getCurOp()->getNS();
break;
}
@@ -156,7 +156,7 @@ namespace {
catch (const AssertionException& assertionEx) {
warning() << "Caught Assertion while trying to profile "
<< opToString(op)
- << " against " << CurOp::get(txn)->getNS()
+ << " against " << txn->getCurOp()->getNS()
<< ": " << assertionEx.toString() << endl;
}
}