Changes to speed up Configuration

src/FluentNHibernate/MappingModel/MappedMembers.cs

@@ -55,8 +55,9 @@ public void AddOrReplaceFilter(FilterMapping mapping)
 
         public void AddProperty(PropertyMapping property)
         {
-            if (Properties.Any(x => x.Name == property.Name))
-                throw new InvalidOperationException("Tried to add property '" + property.Name + "' when already added.");
+            string propertyName = property.Name;
+            if (Properties.Any(x => x.Name == propertyName))
+                throw new InvalidOperationException("Tried to add property '" + propertyName + "' when already added.");
             AddMapping(property, MappingType.Property);
         }
 

src/FluentNHibernate/PersistenceModel.cs

@@ -77,12 +77,15 @@ public void AddMappingsFromAssembly(Assembly assembly)
 
         public void AddMappingsFromSource(ITypeSource source)
         {
-            source.GetTypes()
+            foreach (object o in source.GetTypes()
                 .Where(x => IsMappingOf<IMappingProvider>(x) ||
                             IsMappingOf<IIndeterminateSubclassMappingProvider>(x) ||
                             IsMappingOf<IExternalComponentMappingProvider>(x) ||
                             IsMappingOf<IFilterDefinition>(x))
-                .Each(Add);
+                .AsParallel().Select(t => t.InstantiateUsingParameterlessConstructor()))
+            {
+                AddObject(o);
+            }
 
             log.LoadedFluentMappingsFromSource(source);
         }
@@ -129,7 +132,11 @@ public void Add(IExternalComponentMappingProvider provider)
         public void Add(Type type)
         {
             var mapping = type.InstantiateUsingParameterlessConstructor();
-
+            AddObject(mapping);
+        }
+        public void AddObject(object mapping)
+        {
+            Type type = mapping.GetType();
             if (mapping is IMappingProvider)
             {
                 log.FluentMappingDiscovered(type);
@@ -276,20 +283,15 @@ public virtual void Configure(Configuration cfg)
         {
             EnsureMappingsBuilt();
 
-            foreach (var mapping in compiledMappings.Where(m => !m.Classes.Any()))
+            foreach (var document in compiledMappings.Where(m => !m.Classes.Any()).AsParallel().Select(m=>new MappingXmlSerializer().Serialize(m)))
             {
-                var serializer = new MappingXmlSerializer();
-                XmlDocument document = serializer.Serialize(mapping);
                 cfg.AddDocument(document);
             }
 
-            foreach (var mapping in compiledMappings.Where(m => m.Classes.Any()))
+            foreach (var t in compiledMappings.Where(m => m.Classes.Any()).AsParallel().Select(m=>Tuple.Create(m, new MappingXmlSerializer().Serialize(m))))
             {
-                var serializer = new MappingXmlSerializer();
-                XmlDocument document = serializer.Serialize(mapping);
-
-                if (cfg.GetClassMapping(mapping.Classes.First().Type) == null)
-                    cfg.AddDocument(document);
+                if (cfg.GetClassMapping(t.Item1.Classes.First().Type) == null)
+                    cfg.AddDocument(t.Item2);
             }
         }