Skip to content
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

Jump to bottom

improve performance / allocations on CreateObject / ResolveArgument #44

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

improve performance / allocations on CreateObject / ResolveArgument #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7fa719
improve CreateObject / ResolveArguments
bollhals Apr 24, 2021
c4fce03
add Benchmarks
bollhals Apr 24, 2021
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
92 changes: 61 additions & 31 deletions BoDi.Performance.Tests/Benchmarks/SingleContainerBenchmarkBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace BODi.Performance.Tests.Benchmarks
{
[HtmlExporter]
[MarkdownExporterAttribute.GitHub]
[MemoryDiagnoser]
[MinColumn, MaxColumn, MeanColumn, MedianColumn, RankColumn]
[Orderer(SummaryOrderPolicy.FastestToSlowest, MethodOrderPolicy.Declared)]
public abstract class SingleContainerBenchmarkBase
Expand All @@ -14,46 +15,48 @@ public abstract class SingleContainerBenchmarkBase
protected internal BoDi1_4.IObjectContainer Container14;
protected internal BoDi_Concurrent_Dictionary_And_Lazy.IObjectContainer Container1Concurrent_Dictionary_And_Lazy;

[Params(true, false)]
public bool AsSingleton { get; set; }

[GlobalSetup]
public void Setup()
{
Container14 = new BoDi1_4.ObjectContainer();
Container14.RegisterFactoryAs(_ => new FactoryRegistered());
Container14.RegisterTypeAs<TypeRegistered, TypeRegistered>();
Container14.RegisterTypeAs<AllRegistered1, IAllRegisteredFromType>();
Container14.RegisterTypeAs<AllRegistered2, IAllRegisteredFromType>();
Container14.RegisterTypeAs<AllRegistered3, IAllRegisteredFromType>();
Container14.RegisterTypeAs<AllRegistered4, IAllRegisteredFromType>();
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered1());
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered2());
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered3());
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered4());
Container14.RegisterFactoryAs(_ => new FactoryRegistered()).MaybeAsSingleton(AsSingleton);
Container14.RegisterTypeAs<TypeRegistered, TypeRegistered>().MaybeAsSingleton(AsSingleton);
Container14.RegisterTypeAs<AllRegistered1, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container14.RegisterTypeAs<AllRegistered2, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container14.RegisterTypeAs<AllRegistered3, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container14.RegisterTypeAs<AllRegistered4, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered1()).MaybeAsSingleton(AsSingleton);
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered2()).MaybeAsSingleton(AsSingleton);
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered3()).MaybeAsSingleton(AsSingleton);
Container14.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered4()).MaybeAsSingleton(AsSingleton);


Container1Concurrent_Dictionary_And_Lazy = new BoDi_Concurrent_Dictionary_And_Lazy.ObjectContainer();
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs(_ => new FactoryRegistered());
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<TypeRegistered, TypeRegistered>();
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered1, IAllRegisteredFromType>();
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered2, IAllRegisteredFromType>();
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered3, IAllRegisteredFromType>();
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered4, IAllRegisteredFromType>();
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered1());
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered2());
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered3());
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered4());
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs(_ => new FactoryRegistered()).MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<TypeRegistered, TypeRegistered>().MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered1, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered2, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered3, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterTypeAs<AllRegistered4, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered1()).MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered2()).MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered3()).MaybeAsSingleton(AsSingleton);
Container1Concurrent_Dictionary_And_Lazy.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered4()).MaybeAsSingleton(AsSingleton);

ContainerCurrent = new ObjectContainer();
ContainerCurrent.RegisterFactoryAs(_ => new FactoryRegistered());
ContainerCurrent.RegisterTypeAs<TypeRegistered, TypeRegistered>();
ContainerCurrent.RegisterTypeAs<AllRegistered1, IAllRegisteredFromType>();
ContainerCurrent.RegisterTypeAs<AllRegistered2, IAllRegisteredFromType>();
ContainerCurrent.RegisterTypeAs<AllRegistered3, IAllRegisteredFromType>();
ContainerCurrent.RegisterTypeAs<AllRegistered4, IAllRegisteredFromType>();
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered1());
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered2());
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered3());
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered4());

ContainerCurrent.RegisterFactoryAs(_ => new FactoryRegistered()).MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterTypeAs<TypeRegistered, TypeRegistered>().MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterTypeAs<AllRegistered1, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterTypeAs<AllRegistered2, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterTypeAs<AllRegistered3, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterTypeAs<AllRegistered4, IAllRegisteredFromType>().MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered1()).MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered2()).MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered3()).MaybeAsSingleton(AsSingleton);
ContainerCurrent.RegisterFactoryAs<IAllRegisteredFromFactory>(_ => new AllRegistered4()).MaybeAsSingleton(AsSingleton);
}

protected internal class FactoryRegistered { }
Expand All @@ -69,4 +72,31 @@ private class AllRegistered2 : IAllRegisteredFromType, IAllRegisteredFromFactory
private class AllRegistered3 : IAllRegisteredFromType, IAllRegisteredFromFactory {}
private class AllRegistered4 : IAllRegisteredFromType, IAllRegisteredFromFactory {}
}

internal static class RegistrationExtensions
{
public static void MaybeAsSingleton(this BoDi1_4.IStrategyRegistration strategyRegistration, bool asSingleton)
{
if (!asSingleton)
{
strategyRegistration.InstancePerDependency();
}
}

public static void MaybeAsSingleton(this BoDi_Concurrent_Dictionary_And_Lazy.IStrategyRegistration strategyRegistration, bool asSingleton)
{
if (!asSingleton)
{
strategyRegistration.InstancePerDependency();
}
}

public static void MaybeAsSingleton(this IStrategyRegistration strategyRegistration, bool asSingleton)
{
if (!asSingleton)
{
strategyRegistration.InstancePerDependency();
}
}
}
}
63 changes: 44 additions & 19 deletions BoDi/BoDi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,32 +924,44 @@ private object ResolveObject(RegistrationKey keyToResolve, ResolutionList resolu
return result;
}


private object CreateObject(Type type, ResolutionList resolutionPath, RegistrationKey keyToResolve)
{
var ctors = type.GetConstructors();
if (ctors.Length == 0)
{
ctors = type.GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance);
}

Debug.Assert(ctors.Length > 0, "Class must have a constructor!");

int maxParamCount = ctors.Max(ctor => ctor.GetParameters().Length);
var maxParamCountCtors = ctors.Where(ctor => ctor.GetParameters().Length == maxParamCount).ToArray();

object obj;
if (maxParamCountCtors.Length == 1)
int maxLength = -1;
ConstructorInfo maxCtor = null;
ParameterInfo[] maxParameterInfos = null;
bool sameLength = false;
foreach (var ctor in ctors)
{
ConstructorInfo ctor = maxParamCountCtors[0];
if (resolutionPath.Contains(keyToResolve))
throw new ObjectContainerException("Circular dependency found! " + type.FullName, resolutionPath.ToTypeList());

var args = ResolveArguments(ctor.GetParameters(), keyToResolve, resolutionPath.AddToEnd(keyToResolve, type));
obj = ctor.Invoke(args);
var parameterInfos = ctor.GetParameters();
if (maxLength < parameterInfos.Length)
{
maxLength = parameterInfos.Length;
maxCtor = ctor;
maxParameterInfos = parameterInfos;
sameLength = false;
}
else if (maxLength == parameterInfos.Length)
{
sameLength = true;
}
}
else
{

if (sameLength)
throw new ObjectContainerException("Multiple public constructors with same maximum parameter count are not supported! " + type.FullName, resolutionPath.ToTypeList());
}

if (resolutionPath != null && resolutionPath.Contains(keyToResolve))
throw new ObjectContainerException("Circular dependency found! " + type.FullName, resolutionPath.ToTypeList());

var args = ResolveArguments(maxParameterInfos, keyToResolve, resolutionPath);
var obj = maxCtor.Invoke(args);

OnObjectCreated(obj);

Expand All @@ -972,17 +984,30 @@ private object InvokeFactoryDelegate(Delegate factoryDelegate, ResolutionList re
return factoryDelegate.DynamicInvoke(args);
}

private object[] ResolveArguments(IEnumerable<ParameterInfo> parameters, RegistrationKey keyToResolve, ResolutionList resolutionPath)
private static readonly object[] NoArgumentArray = new object[0];
private object[] ResolveArguments(ParameterInfo[] parameters, RegistrationKey keyToResolve, ResolutionList resolutionPath)
{
return parameters.Select(p => IsRegisteredNameParameter(p) ? ResolveRegisteredName(keyToResolve) : Resolve(p.ParameterType, resolutionPath, null)).ToArray();
if (parameters.Length == 0)
{
return NoArgumentArray;
}

var args = new object[parameters.Length];
for (var i = 0; i < parameters.Length; i++)
{
var p = parameters[i];
args[i] = IsRegisteredNameParameter(p) ? ResolveRegisteredName(keyToResolve) : Resolve(p.ParameterType, resolutionPath, null);
}

return args;
}

private object ResolveRegisteredName(RegistrationKey keyToResolve)
private static object ResolveRegisteredName(RegistrationKey keyToResolve)
{
return keyToResolve.Name;
}

private bool IsRegisteredNameParameter(ParameterInfo parameterInfo)
private static bool IsRegisteredNameParameter(ParameterInfo parameterInfo)
{
return parameterInfo.ParameterType == typeof(string) &&
parameterInfo.Name.Equals(REGISTERED_NAME_PARAMETER_NAME);
Expand Down