Improve performance registering services comparing to existing servic…

…es (#618)

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Add fast lookup to check for already registered types. (@sqeezy, #618)
 - Change target framework from .NET Standard 1.6 to 2.0 (@generik0, #572)
 
 Bugfixes:

src/Castle.Windsor/Core/ComponentModel.cs

@@ -40,6 +40,7 @@ public sealed class ComponentModel : GraphNode
 
 		[DebuggerBrowsable(DebuggerBrowsableState.Never)]
 		private readonly List<Type> services = new List<Type>(4);
+		private readonly HashSet<Type> servicesLookup = new HashSet<Type>();
 
 		[DebuggerBrowsable(DebuggerBrowsableState.Never)]
 		private ComponentName componentName;
@@ -331,6 +332,11 @@ public IEnumerable<Type> Services
 		{
 			get { return services; }
 		}
+
+		internal HashSet<Type> ServicesLookup
+		{
+			get { return servicesLookup; }
+		}
 
 		[DebuggerBrowsable(DebuggerBrowsableState.Never)]
 		internal ParameterModelCollection ParametersInternal
@@ -378,7 +384,7 @@ public void AddService(Type type)
 					              type));
 			}
 
-			ComponentServicesUtil.AddService(services, type);
+			ComponentServicesUtil.AddService(services, servicesLookup, type);
 		}
 
 		/// <summary>

src/Castle.Windsor/Core/Internal/ComponentServicesUtil.cs

@@ -22,15 +22,16 @@ public class ComponentServicesUtil
 	{
 		private static readonly TypeByInheritanceDepthMostSpecificFirstComparer comparer = new TypeByInheritanceDepthMostSpecificFirstComparer();
 
-		public static void AddService(IList<Type> existingServices, Type newService)
+		public static void AddService(IList<Type> existingServices, HashSet<Type> lookup, Type newService)
 		{
-			if (existingServices.Contains(newService))
+			if (lookup.Contains(newService))
 			{
 				return;
 			}
 			if (newService.GetTypeInfo().IsInterface)
 			{
 				existingServices.Add(newService);
+				lookup.Add(newService);
 				return;
 			}
 			if (newService.GetTypeInfo().IsClass == false)
@@ -44,18 +45,21 @@ public static void AddService(IList<Type> existingServices, Type newService)
 				if (existingServices[i].GetTypeInfo().IsInterface)
 				{
 					existingServices.Insert(i, newService);
+					lookup.Add(newService);
 				}
 				var result = comparer.Compare(newService, existingServices[i]);
 				if (result < 0)
 				{
 					existingServices.Insert(i, newService);
+					lookup.Add(newService);
 					return;
 				}
 				if (result == 0)
 				{
 					return;
 				}
 			}
+			lookup.Add(newService);
 			existingServices.Add(newService);
 		}
 	}

src/Castle.Windsor/MicroKernel/Handlers/AbstractHandler.cs

@@ -183,7 +183,7 @@ public object Resolve(CreationContext context)
 
 		public virtual bool Supports(Type service)
 		{
-			return ComponentModel.Services.Contains(service);
+			return ComponentModel.ServicesLookup.Contains(service);
 		}
 
 		public virtual bool SupportsAssignable(Type service)

src/Castle.Windsor/MicroKernel/Registration/ComponentRegistration.cs

@@ -47,6 +47,7 @@ public class ComponentRegistration<TService> : IRegistration
 	{
 		private readonly List<IComponentModelDescriptor> descriptors = new List<IComponentModelDescriptor>();
 		private readonly List<Type> potentialServices = new List<Type>();
+		private readonly HashSet<Type> potentialServicesLookup = new HashSet<Type>();
 
 		private bool ifComponentRegisteredIgnore;
 		private Type implementation;
@@ -473,7 +474,7 @@ public ComponentRegistration<TService> Forward(IEnumerable<Type> types)
 		{
 			foreach (var type in types)
 			{
-				ComponentServicesUtil.AddService(potentialServices, type);
+				ComponentServicesUtil.AddService(potentialServices, potentialServicesLookup, type);
 			}
 			return this;
 		}