diff options
author | Maria van Keulen <maria@mongodb.com> | 2017-03-07 12:00:08 -0500 |
---|---|---|
committer | Maria van Keulen <maria@mongodb.com> | 2017-03-07 12:00:08 -0500 |
commit | 589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79 (patch) | |
tree | c7a090ffdd56a91ae677e2492c61b820af44f964 /src/mongo/db/repl/task_runner.cpp | |
parent | 3cba97198638df3750e3b455e2ad57af7ee536ae (diff) | |
download | mongo-589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79.tar.gz |
SERVER-27938 Rename all OperationContext variables to opCtx
This commit is an automated rename of all whole word instances of txn,
_txn, and txnPtr to opCtx, _opCtx, and opCtxPtr, respectively in all
.cpp and .h files in src/mongo.
Diffstat (limited to 'src/mongo/db/repl/task_runner.cpp')
-rw-r--r-- | src/mongo/db/repl/task_runner.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mongo/db/repl/task_runner.cpp b/src/mongo/db/repl/task_runner.cpp index 210718bba3e..d364151a228 100644 --- a/src/mongo/db/repl/task_runner.cpp +++ b/src/mongo/db/repl/task_runner.cpp @@ -60,10 +60,10 @@ using LockGuard = stdx::lock_guard<stdx::mutex>; * next action of kCancel. */ TaskRunner::NextAction runSingleTask(const TaskRunner::Task& task, - OperationContext* txn, + OperationContext* opCtx, const Status& status) { try { - return task(txn, status); + return task(opCtx, status); } catch (...) { log() << "Unhandled exception in task runner: " << redact(exceptionToStatus()); } @@ -74,7 +74,7 @@ TaskRunner::NextAction runSingleTask(const TaskRunner::Task& task, // static TaskRunner::Task TaskRunner::makeCancelTask() { - return [](OperationContext* txn, const Status& status) { return NextAction::kCancel; }; + return [](OperationContext* opCtx, const Status& status) { return NextAction::kCancel; }; } TaskRunner::TaskRunner(OldThreadPool* threadPool) @@ -132,10 +132,10 @@ void TaskRunner::join() { void TaskRunner::_runTasks() { Client* client = nullptr; - ServiceContext::UniqueOperationContext txn; + ServiceContext::UniqueOperationContext opCtx; while (Task task = _waitForNextTask()) { - if (!txn) { + if (!opCtx) { if (!client) { // We initialize cc() because ServiceContextMongoD::_newOpCtx() expects cc() // to be equal to the client used to create the operation context. @@ -145,13 +145,13 @@ void TaskRunner::_runTasks() { AuthorizationSession::get(client)->grantInternalAuthorization(); } } - txn = client->makeOperationContext(); + opCtx = client->makeOperationContext(); } - NextAction nextAction = runSingleTask(task, txn.get(), Status::OK()); + NextAction nextAction = runSingleTask(task, opCtx.get(), Status::OK()); if (nextAction != NextAction::kKeepOperationContext) { - txn.reset(); + opCtx.reset(); } if (nextAction == NextAction::kCancel) { @@ -167,7 +167,7 @@ void TaskRunner::_runTasks() { } } } - txn.reset(); + opCtx.reset(); std::list<Task> tasks; UniqueLock lk{_mutex}; @@ -221,13 +221,13 @@ Status TaskRunner::runSynchronousTask(SynchronousTask func, TaskRunner::NextActi stdx::condition_variable waitTillDoneCond; Status returnStatus{Status::OK()}; - this->schedule([&](OperationContext* txn, const Status taskStatus) { + this->schedule([&](OperationContext* opCtx, const Status taskStatus) { if (!taskStatus.isOK()) { returnStatus = taskStatus; } else { // Run supplied function. try { - returnStatus = func(txn); + returnStatus = func(opCtx); } catch (...) { returnStatus = exceptionToStatus(); error() << "Exception thrown in runSynchronousTask: " << redact(returnStatus); |