summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/lock_manager.cpp
diff options
context:
space:
mode:
authorDaniel Gottlieb <daniel.gottlieb@10gen.com>2016-12-08 11:25:40 -0500
committerDaniel Gottlieb <daniel.gottlieb@10gen.com>2016-12-08 11:39:47 -0500
commit114f26722933a5730eac7ff584eeebffdb974e52 (patch)
tree98cb3ecaf23131ed6aa5896d6b448cd40b312e71 /src/mongo/db/concurrency/lock_manager.cpp
parentd55eb9d186f3039695a4d710116e79ad04536409 (diff)
downloadmongo-114f26722933a5730eac7ff584eeebffdb974e52.tar.gz
SERVER-25373: Add diagnostic labels to ResourceMutex instances
Diffstat (limited to 'src/mongo/db/concurrency/lock_manager.cpp')
-rw-r--r--src/mongo/db/concurrency/lock_manager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mongo/db/concurrency/lock_manager.cpp b/src/mongo/db/concurrency/lock_manager.cpp
index c569faf478d..815a235d623 100644
--- a/src/mongo/db/concurrency/lock_manager.cpp
+++ b/src/mongo/db/concurrency/lock_manager.cpp
@@ -36,6 +36,7 @@
#include "mongo/base/static_assert.h"
#include "mongo/bson/bsonobjbuilder.h"
#include "mongo/config.h"
+#include "mongo/db/concurrency/d_concurrency.h"
#include "mongo/db/concurrency/locker.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/log.h"
@@ -1123,6 +1124,9 @@ ResourceId::ResourceId(ResourceType type, uint64_t hashId) : _fullHash(fullHash(
std::string ResourceId::toString() const {
StringBuilder ss;
ss << "{" << _fullHash << ": " << resourceTypeName(getType()) << ", " << getHashId();
+ if (getType() == RESOURCE_MUTEX) {
+ ss << ", " << Lock::ResourceMutex::getName(*this);
+ }
#ifdef MONGO_CONFIG_DEBUG_BUILD
ss << ", " << _nsCopy;