Remove Lock from DefaultNamingSubSystem in benefit of ReaderWriterLockSlim

castleproject#565

Author: generik0

src/Castle.Windsor/MicroKernel/SubSystems/Naming/DefaultNamingSubSystem.cs

@@ -18,14 +18,15 @@ namespace Castle.MicroKernel.SubSystems.Naming
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Reflection;
+	using System.Threading;
 
 	using Castle.Core.Internal;
 	using Castle.MicroKernel.Util;
 
 	[Serializable]
 	public class DefaultNamingSubSystem : AbstractSubSystem, INamingSubSystem
 	{
-		protected readonly Lock @lock = Lock.Create();
+		private readonly ReaderWriterLockSlim @lock = new ReaderWriterLockSlim();
 
 		/// <summary>
 		///   Map(String, IHandler) to map component names to <see cref="IHandler" /> Items in this dictionary are sorted in insertion order.
@@ -65,12 +66,17 @@ protected IDictionary<string, IHandler> HandlerByNameCache
 				{
 					return cache;
 				}
-				using (@lock.ForWriting())
+				@lock.EnterWriteLock();
+				try
 				{
 					cache = new Dictionary<string, IHandler>(name2Handler, name2Handler.Comparer);
 					handlerByNameCache = cache;
 					return cache;
 				}
+				finally
+				{
+					@lock.ExitWriteLock();
+				}
 			}
 		}
 
@@ -83,7 +89,8 @@ protected IDictionary<Type, IHandler> HandlerByServiceCache
 				{
 					return cache;
 				}
-				using (@lock.ForWriting())
+				@lock.EnterWriteLock();
+				try
 				{
 					cache = new Dictionary<Type, IHandler>(service2Handler.Count, service2Handler.Comparer);
 					foreach (var item in service2Handler)
@@ -93,6 +100,10 @@ protected IDictionary<Type, IHandler> HandlerByServiceCache
 					handlerByServiceCache = cache;
 					return cache;
 				}
+				finally
+				{
+					@lock.ExitWriteLock();
+				}
 			}
 		}
 
@@ -223,17 +234,30 @@ public virtual IHandler[] GetHandlers(Type service)
 			}
 
 			IHandler[] result;
-			using (var locker = @lock.ForReadingUpgradeable())
+			@lock.EnterUpgradeableReadLock();
+			try
 			{
 				if (handlerListsByTypeCache.TryGetValue(service, out result))
 				{
 					return result;
 				}
 				result = GetHandlersNoLock(service);
-
-				locker.Upgrade();
-				handlerListsByTypeCache[service] = result;
+				@lock.EnterWriteLock();
+				try
+				{
+					handlerListsByTypeCache[service] = result;
+				}
+				finally
+				{
+					@lock.ExitWriteLock();
+				}
+				
 			}
+			finally
+			{
+				@lock.ExitUpgradeableReadLock();
+			}
+			
 
 			return result;
 		}
@@ -242,7 +266,8 @@ public virtual IHandler[] GetHandlers(Type service)
 		public virtual void Register(IHandler handler)
 		{
 			var name = handler.ComponentModel.Name;
-			using (@lock.ForWriting())
+			@lock.EnterReadLock();
+			try
 			{
 				try
 				{
@@ -255,6 +280,7 @@ public virtual void Register(IHandler handler)
 							"Component {0} could not be registered. There is already a component with that name. Did you want to modify the existing component instead? If not, make sure you specify a unique name.",
 							name));
 				}
+
 				var serviceSelector = GetServiceSelector(handler);
 				foreach (var service in handler.ComponentModel.Services)
 				{
@@ -265,29 +291,47 @@ public virtual void Register(IHandler handler)
 						service2Handler[service] = handlerForService;
 					}
 				}
+
 				InvalidateCache();
 			}
+			finally
+			{
+				@lock.ExitReadLock();
+			}
 		}
 
 		protected IHandler[] GetAssignableHandlersNoFiltering(Type service)
 		{
 			IHandler[] result;
-			using (var locker = @lock.ForReadingUpgradeable())
+			@lock.EnterUpgradeableReadLock();
+			try
 			{
 				if (assignableHandlerListsByTypeCache.TryGetValue(service, out result))
 				{
 					return result;
 				}
 
-				locker.Upgrade();
-				if (assignableHandlerListsByTypeCache.TryGetValue(service, out result))
+				@lock.EnterWriteLock();
+				try
 				{
-					return result;
+					if (assignableHandlerListsByTypeCache.TryGetValue(service, out result))
+					{
+						return result;
+					}
+
+					result = name2Handler.Values.Where(h => h.SupportsAssignable(service)).ToArray();
+					assignableHandlerListsByTypeCache[service] = result;
+				}
+				finally
+				{
+					@lock.ExitWriteLock();
 				}
-				result = name2Handler.Values.Where(h => h.SupportsAssignable(service)).ToArray();
-				assignableHandlerListsByTypeCache[service] = result;
+				
+			}
+			finally
+			{
+				@lock.ExitUpgradeableReadLock();
 			}
-
 			return result;
 		}