SERVER-39960 Simplify opCtx::markKilled

Operation context currently relies on an elaborate dance between the
client lock, _waitMutex, _waitCV and _numKillers to allow markKilled to
tap the condvar an opctx is waiting on.

After the introduction of batons on all opctx's, this is no longer
necessary (as batons have their own support for being woken, while
waiting on a condvar). Removing the special killing code will simplify
opctx, and remove a lot of extra book keeping.

1 files changed, 0 insertions, 19 deletions

diff --git a/src/mongo/db/operation_context.h b/src/mongo/db/operation_context.h
index 56a363aab3e..ffa9678d7a0 100644
--- a/src/mongo/db/operation_context.h
+++ b/src/mongo/db/operation_context.h
@@ -446,27 +446,8 @@ private:
     // once from OK to some kill code.
     AtomicWord<ErrorCodes::Error> _killCode{ErrorCodes::OK};
 
-    // A transport Baton associated with the operation. The presence of this object implies that a
-    // client thread is doing it's own async networking by blocking on it's own thread.
     BatonHandle _baton;
 
-    // If non-null, _waitMutex and _waitCV are the (mutex, condition variable) pair that the
-    // operation is currently waiting on inside a call to waitForConditionOrInterrupt...().
-    //
-    // _waitThread is the calling thread's thread id.
-    //
-    // All access guarded by the Client's lock.
-    stdx::mutex* _waitMutex = nullptr;
-    stdx::condition_variable* _waitCV = nullptr;
-    stdx::thread::id _waitThread;
-
-    // If _waitMutex and _waitCV are non-null, this is the number of threads in a call to markKilled
-    // actively attempting to kill the operation. If this value is non-zero, the operation is inside
-    // waitForConditionOrInterrupt...() and must stay there until _numKillers reaches 0.
-    //
-    // All access guarded by the Client's lock.
-    int _numKillers = 0;
-
     WriteConcernOptions _writeConcern;
 
     // The timepoint at which this operation exceeds its time limit.