Wrap DoDecompileEvent(IMethod...)

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -1429,43 +1429,52 @@ namespace ICSharpCode.Decompiler.CSharp
 		EntityDeclaration DoDecompile(IMethod method, DecompileRun decompileRun, ITypeResolveContext decompilationContext)
 		{
 			Debug.Assert(decompilationContext.CurrentMember == method);
-			var typeSystemAstBuilder = CreateAstBuilder(decompileRun.Settings);
+			var watch = System.Diagnostics.Stopwatch.StartNew();
-			var methodDecl = typeSystemAstBuilder.ConvertEntity(method);
+			try
-			int lastDot = method.Name.LastIndexOf('.');
-			if (method.IsExplicitInterfaceImplementation && lastDot >= 0)
-			{
-				methodDecl.Name = method.Name.Substring(lastDot + 1);
-			}
-			FixParameterNames(methodDecl);
-			var methodDefinition = metadata.GetMethodDefinition((MethodDefinitionHandle)method.MetadataToken);
-			if (!settings.LocalFunctions && LocalFunctionDecompiler.LocalFunctionNeedsAccessibilityChange(method.ParentModule.PEFile, (MethodDefinitionHandle)method.MetadataToken))
-			{
-				// if local functions are not active and we're dealing with a local function,
-				// reduce the visibility of the method to private,
-				// otherwise this leads to compile errors because the display classes have lesser accessibility.
-				// Note: removing and then adding the static modifier again is necessary to set the private modifier before all other modifiers.
-				methodDecl.Modifiers &= ~(Modifiers.Internal | Modifiers.Static);
-				methodDecl.Modifiers |= Modifiers.Private | (method.IsStatic ? Modifiers.Static : 0);
-			}
-			if (methodDefinition.HasBody())
-			{
-				DecompileBody(method, methodDecl, decompileRun, decompilationContext);
-			}
-			else if (!method.IsAbstract && method.DeclaringType.Kind != TypeKind.Interface)
-			{
-				methodDecl.Modifiers |= Modifiers.Extern;
-			}
-			if (method.SymbolKind == SymbolKind.Method && !method.IsExplicitInterfaceImplementation && methodDefinition.HasFlag(System.Reflection.MethodAttributes.Virtual) == methodDefinition.HasFlag(System.Reflection.MethodAttributes.NewSlot))
 			{
-				SetNewModifier(methodDecl);
+				var typeSystemAstBuilder = CreateAstBuilder(decompileRun.Settings);
+				var methodDecl = typeSystemAstBuilder.ConvertEntity(method);
+				int lastDot = method.Name.LastIndexOf('.');
+				if (method.IsExplicitInterfaceImplementation && lastDot >= 0)
+				{
+					methodDecl.Name = method.Name.Substring(lastDot + 1);
+				}
+				FixParameterNames(methodDecl);
+				var methodDefinition = metadata.GetMethodDefinition((MethodDefinitionHandle)method.MetadataToken);
+				if (!settings.LocalFunctions && LocalFunctionDecompiler.LocalFunctionNeedsAccessibilityChange(method.ParentModule.PEFile, (MethodDefinitionHandle)method.MetadataToken))
+				{
+					// if local functions are not active and we're dealing with a local function,
+					// reduce the visibility of the method to private,
+					// otherwise this leads to compile errors because the display classes have lesser accessibility.
+					// Note: removing and then adding the static modifier again is necessary to set the private modifier before all other modifiers.
+					methodDecl.Modifiers &= ~(Modifiers.Internal | Modifiers.Static);
+					methodDecl.Modifiers |= Modifiers.Private | (method.IsStatic ? Modifiers.Static : 0);
+				}
+				if (methodDefinition.HasBody())
+				{
+					DecompileBody(method, methodDecl, decompileRun, decompilationContext);
+				}
+				else if (!method.IsAbstract && method.DeclaringType.Kind != TypeKind.Interface)
+				{
+					methodDecl.Modifiers |= Modifiers.Extern;
+				}
+				if (method.SymbolKind == SymbolKind.Method && !method.IsExplicitInterfaceImplementation && methodDefinition.HasFlag(System.Reflection.MethodAttributes.Virtual) == methodDefinition.HasFlag(System.Reflection.MethodAttributes.NewSlot))
+				{
+					SetNewModifier(methodDecl);
+				}
+				if (IsCovariantReturnOverride(method))
+				{
+					RemoveAttribute(methodDecl, KnownAttribute.PreserveBaseOverrides);
+					methodDecl.Modifiers &= ~(Modifiers.New | Modifiers.Virtual);
+					methodDecl.Modifiers |= Modifiers.Override;
+				}
+				return methodDecl;
 			}
-			if (IsCovariantReturnOverride(method))
+			finally
 			{
-				RemoveAttribute(methodDecl, KnownAttribute.PreserveBaseOverrides);
+				watch.Stop();
-				methodDecl.Modifiers &= ~(Modifiers.New | Modifiers.Virtual);
+				Instrumentation.DecompilerEventSource.Log.DoDecompileMethod(method.FullName, watch.ElapsedMilliseconds);
-				methodDecl.Modifiers |= Modifiers.Override;
 			}
-			return methodDecl;
 		}
 
 		private bool IsCovariantReturnOverride(IEntity entity)

ICSharpCode.Decompiler/Instrumentation/DecompilerEventSource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Diagnostics.Tracing;
-using System.Diagnostics.Tracing;
 
 namespace ICSharpCode.Decompiler.Instrumentation
 {
@@ -30,6 +29,12 @@ namespace ICSharpCode.Decompiler.Instrumentation
 			WriteEvent(4, typeDefName, elapsedMilliseconds);
 		}
 
+		[Event(5, Level = EventLevel.Informational)]
+		public void DoDecompileMethod(string methodName, long elapsedMilliseconds)
+		{
+			WriteEvent(5, methodName, elapsedMilliseconds);
+		}
+
 		public static DecompilerEventSource Log = new DecompilerEventSource();
 	}