summaryrefslogtreecommitdiff
path: root/src/mongo/db/curop.h
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2015-05-22 13:24:29 -0400
committerAndy Schwerin <schwerin@mongodb.com>2015-05-29 10:27:55 -0400
commit5c2d133871b2ad2adf6c617364d036ca25261f2d (patch)
treee3e28fa7bd0e56fa95802bb5770c9bbd4bee6da3 /src/mongo/db/curop.h
parent1f4188fbdc733aa1cb08403d75f13a04d2279817 (diff)
downloadmongo-5c2d133871b2ad2adf6c617364d036ca25261f2d.tar.gz
SERVER-18277 Clarify locking of Client when accessing its stored OperationContext.
As a side-effect, clean up operation killing in ServiceContextMongoD.
Diffstat (limited to 'src/mongo/db/curop.h')
-rw-r--r--src/mongo/db/curop.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h
index b3f96d66d3a..66201f53fdd 100644
--- a/src/mongo/db/curop.h
+++ b/src/mongo/db/curop.h
@@ -38,12 +38,10 @@
#include "mongo/db/server_options.h"
#include "mongo/platform/atomic_word.h"
#include "mongo/util/concurrency/spin_lock.h"
-#include "mongo/util/net/hostandport.h"
#include "mongo/util/progress_meter.h"
#include "mongo/util/thread_safe_string.h"
#include "mongo/util/time_support.h"
-
namespace mongo {
class Client;
@@ -197,7 +195,6 @@ namespace mongo {
class CurOp {
MONGO_DISALLOW_COPYING(CurOp);
public:
- static CurOp* getFromClient(const Client* client);
static CurOp* get(const OperationContext* opCtx);
static CurOp* get(const OperationContext& opCtx);