X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=data%2Flock-decoder%2FLockTracerDecoder.cs;h=08576f1a7de515eeda783c2936310d8288aa6629;hb=d750c58ae91b6b7762b81c7949957b2fa56f72ab;hp=f838c5b21f9299b70a9b0b9d22e6b8d1e38a2e22;hpb=99b5aad5ee74b270b33e3779cf14cf18d847db50;p=mono.git

diff --git a/data/lock-decoder/LockTracerDecoder.cs b/data/lock-decoder/LockTracerDecoder.cs
index f838c5b21f9..08576f1a7de 100644
--- a/data/lock-decoder/LockTracerDecoder.cs
+++ b/data/lock-decoder/LockTracerDecoder.cs
@@ -143,6 +143,9 @@ public enum Lock {
 	IcallLock,
 	AssemblyBindingLock,
 	MarshalLock,
+	ClassesLock,
+	LoaderGlobalDataLock,
+	ThreadsLock,
 }
 
 public class SimLock
@@ -240,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);
+		}
 	}
 }
 
@@ -309,6 +329,10 @@ public class Trace {
 		"add_record",
 		"mono_locks_lock_acquired",
 		"mono_locks_lock_released",
+		"mono_threads_lock",
+		"mono_threads_unlock",
+		"mono_domain_lock",
+		"mono_domain_unlock",
 	};
 
 	public Trace (string[] fields) {