diff options
author | Andy Schwerin <schwerin@mongodb.com> | 2015-04-06 17:07:02 -0400 |
---|---|---|
committer | Andy Schwerin <schwerin@mongodb.com> | 2015-04-07 11:28:49 -0400 |
commit | 6febdbaf542464bab747e3ab3ba49ad7b38acd8f (patch) | |
tree | ca13cd69929179dc3927cac9895bff3e3fc74787 /src/mongo/db/client.cpp | |
parent | 7dc9a83e8be3446551297e746dad4f6d74b7dca2 (diff) | |
download | mongo-6febdbaf542464bab747e3ab3ba49ad7b38acd8f.tar.gz |
SERVER-17817 Make CurOp a decoration of ClientBasic, not a member of Client.
Diffstat (limited to 'src/mongo/db/client.cpp')
-rw-r--r-- | src/mongo/db/client.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp index c408723d462..6fe85d249e2 100644 --- a/src/mongo/db/client.cpp +++ b/src/mongo/db/client.cpp @@ -111,8 +111,6 @@ namespace mongo { _connectionId(p ? p->connectionId() : 0), _inDirectClient(false), _txn(NULL) { - - _curOp = new CurOp( this ); } Client::~Client() { @@ -122,13 +120,6 @@ namespace mongo { boost::lock_guard<boost::mutex> clientLock(clientsMutex); clients.erase(this); } - - CurOp* last; - do { - last = _curOp; - delete _curOp; - // _curOp may have been reset to _curOp->_wrapped - } while (_curOp != last); } } @@ -167,9 +158,13 @@ namespace mongo { } string Client::clientAddress(bool includePort) const { - if( _curOp ) - return _curOp->getRemoteString(includePort); - return ""; + if (!hasRemote()) { + return ""; + } + if (includePort) { + return getRemote().toString(); + } + return getRemote().host(); } ClientBasic* ClientBasic::getCurrent() { |