diff options
author | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:14:03 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:14:03 -0400 |
commit | 993fc5e4ed9264965f16a948d3732d3fc55d1255 (patch) | |
tree | d5288061d1d0e10bc499e37d728c40ce83bcb06f /src/mongo/db/curop.h | |
parent | e181ea38af737ef7aaf5f8228f870d8c7149b2bb (diff) | |
download | mongo-993fc5e4ed9264965f16a948d3732d3fc55d1255.tar.gz |
Revert "SERVER-18277 Clarify locking of Client when accessing its stored OperationContext."
This reverts commit 5c2d133871b2ad2adf6c617364d036ca25261f2d.
Diffstat (limited to 'src/mongo/db/curop.h')
-rw-r--r-- | src/mongo/db/curop.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h index 66201f53fdd..b3f96d66d3a 100644 --- a/src/mongo/db/curop.h +++ b/src/mongo/db/curop.h @@ -38,10 +38,12 @@ #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; @@ -195,6 +197,7 @@ 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); |