SERVER-17416 MMAP V1 journal thread should check for deadlocks

Also improve the reporting of the Locker::dump function.

1 files changed, 20 insertions, 0 deletions

diff --git a/src/mongo/db/concurrency/lock_manager.cpp b/src/mongo/db/concurrency/lock_manager.cpp
index eaa901ee04f..30468418643 100644
--- a/src/mongo/db/concurrency/lock_manager.cpp
+++ b/src/mongo/db/concurrency/lock_manager.cpp
@@ -118,6 +118,22 @@ namespace {
     BOOST_STATIC_ASSERT(
         (sizeof(ResourceTypeNames) / sizeof(ResourceTypeNames[0])) == ResourceTypesCount);
 
+
+    /**
+     * Maps the LockRequest status to a human-readable string.
+     */
+    static const char* LockRequestStatusNames[] = {
+        "new",
+        "granted",
+        "waiting",
+        "converting",
+    };
+
+    // Ensure we do not add new status types without updating the names array
+    BOOST_STATIC_ASSERT(
+        (sizeof(LockRequestStatusNames) / sizeof(LockRequestStatusNames[0]))
+                                                                == LockRequest::StatusCount);
+
 } // namespace
 
 
@@ -1132,4 +1148,8 @@ namespace {
         return ResourceTypeNames[resourceType];
     }
 
+    const char* lockRequestStatusName(LockRequest::Status status) {
+        return LockRequestStatusNames[status];
+    }
+
 } // namespace mongo