Skip to content

Improve cache performance of MethodFinder.GetAllInstanceMethods #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonorossi merged 7 commits into from
Jun 1, 2018
Merged

Improve cache performance of MethodFinder.GetAllInstanceMethods #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9694023
Replace Dictionary to HashSet
tangdf May 11, 2018
7e8b550
Merge pull request #1 from tangdf/Replace_Dictionary_to_HashSet
tangdf May 11, 2018
b3ffa4c
Replace KeyValuePair<MethodInfo, Type> to custom struct
tangdf May 14, 2018
0135114
Merge pull request #2 from tangdf/CacheKey
tangdf May 14, 2018
a5893ed
Merge branch 'master' into master
tangdf May 14, 2018
a6ffe32
Remove the RemoveDuplicates method
tangdf May 31, 2018
857367b
Add namespace references
tangdf May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions src/Castle.Core/DynamicProxy/Generators/MethodFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace Castle.DynamicProxy.Generators
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;

/// <summary>
Expand All @@ -24,7 +25,7 @@ namespace Castle.DynamicProxy.Generators
/// </summary>
public class MethodFinder
{
private static readonly Dictionary<Type, object> cachedMethodInfosByType = new Dictionary<Type, object>();
private static readonly Dictionary<Type, MethodInfo[]> cachedMethodInfosByType = new Dictionary<Type, MethodInfo[]>();
private static readonly object lockObject = new object();

public static MethodInfo[] GetAllInstanceMethods(Type type, BindingFlags flags)
Expand All @@ -38,16 +39,18 @@ public static MethodInfo[] GetAllInstanceMethods(Type type, BindingFlags flags)

lock (lockObject)
{
if (!cachedMethodInfosByType.ContainsKey(type))
if (!cachedMethodInfosByType.TryGetValue(type, out methodsInCache))
{
// We always load all instance methods into the cache, we will filter them later
methodsInCache = type.GetMethods(
BindingFlags.Public | BindingFlags.NonPublic
| BindingFlags.Instance)
.Distinct(MethodSignatureComparer.Instance)
.ToArray();
cachedMethodInfosByType.Add(
type,
RemoveDuplicates(type.GetMethods(
BindingFlags.Public | BindingFlags.NonPublic
| BindingFlags.Instance)));
methodsInCache);
}
methodsInCache = (MethodInfo[])cachedMethodInfosByType[type];
}
return MakeFilteredCopy(methodsInCache, flags & (BindingFlags.Public | BindingFlags.NonPublic));
}
Expand Down Expand Up @@ -76,19 +79,5 @@ private static MethodInfo[] MakeFilteredCopy(MethodInfo[] methodsInCache, Bindin
return result.ToArray();
}

private static object RemoveDuplicates(MethodInfo[] infos)
{
var uniqueInfos = new Dictionary<MethodInfo, object>(MethodSignatureComparer.Instance);
foreach (var info in infos)
{
if (!uniqueInfos.ContainsKey(info))
{
uniqueInfos.Add(info, null);
}
}
var result = new MethodInfo[uniqueInfos.Count];
uniqueInfos.Keys.CopyTo(result, 0);
return result;
}
}
}
}
2 changes: 1 addition & 1 deletion src/Castle.Core/DynamicProxy/Internal/InvocationHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@ public override int GetHashCode()
}
}
}
}
}