[lock-tracer] Small improvements to the decoder.

1 files changed, 20 insertions, 1 deletions

diff --git a/data/lock-decoder/LockTracerDecoder.cs b/data/lock-decoder/LockTracerDecoder.cs
index 79336e985d5..08576f1a7de 100644
--- a/data/lock-decoder/LockTracerDecoder.cs
+++ b/data/lock-decoder/LockTracerDecoder.cs
@@ -243,7 +243,24 @@ public class SimLock
 	}
 
 	public override string ToString () {
-		return String.Format ("{0}", kind);
+		switch (kind) {
+		case Lock.LoaderLock:
+		case Lock.IcallLock:
+		case Lock.AssemblyBindingLock:
+		case Lock.MarshalLock:
+		case Lock.ClassesLock:
+		case Lock.LoaderGlobalDataLock:
+		case Lock.ThreadsLock:
+			return String.Format ("{0}", kind);
+
+		case Lock.ImageDataLock:
+		case Lock.DomainLock:
+		case Lock.DomainAssembliesLock:
+		case Lock.DomainJitCodeHashLock:
+			return String.Format ("{0}[{1}]", kind, id);
+		default:
+			return String.Format ("Unknown({0})[{1}]", kind, id);
+		}
 	}
 }
 
@@ -314,6 +331,8 @@ public class Trace {
 		"mono_locks_lock_released",
 		"mono_threads_lock",
 		"mono_threads_unlock",
+		"mono_domain_lock",
+		"mono_domain_unlock",
 	};
 
 	public Trace (string[] fields) {