Merge pull request #393 from Xharze/avoidSomeReflection

Avoid uneccassary reflection
NLog · Jul 22, 2014 · 3a0cc40 · 3a0cc40
2 parents e5c60ec + ed9e733
commit 3a0cc40
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 32 deletions.
diff --git a/src/NLog/Config/ConfigurationItemFactory.cs b/src/NLog/Config/ConfigurationItemFactory.cs
@@ -29,8 +29,10 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 // THE POSSIBILITY OF SUCH DAMAGE.
-// 
-
+// 
+
+using NLog.Common;
+
 namespace NLog.Config
 {
     using System;
@@ -187,11 +189,13 @@ public void RegisterItemsFromAssembly(Assembly assembly)
         /// </summary>
         /// <param name="assembly">The assembly.</param>
         /// <param name="itemNamePrefix">Item name prefix.</param>
-        public void RegisterItemsFromAssembly(Assembly assembly, string itemNamePrefix)
-        {
+        public void RegisterItemsFromAssembly(Assembly assembly, string itemNamePrefix)
+        {
+            InternalLogger.Debug("ScanAssembly('{0}')", assembly.FullName);
+            var typesToScan = assembly.SafeGetTypes();
             foreach (IFactory f in this.allFactories)
-            {
-                f.ScanAssembly(assembly, itemNamePrefix);
+            {
+                f.ScanTypes(typesToScan, itemNamePrefix);
             }
         }
 

diff --git a/src/NLog/Config/Factory.cs b/src/NLog/Config/Factory.cs
@@ -35,7 +35,6 @@ namespace NLog.Config
 {
     using System;
     using System.Collections.Generic;
-    using System.Reflection;
     using NLog.Common;
     using NLog.Internal;
 
@@ -61,26 +60,25 @@ internal Factory(ConfigurationItemFactory parentFactory)
         /// <summary>
         /// Scans the assembly.
         /// </summary>
-        /// <param name="theAssembly">The assembly.</param>
+        /// <param name="types">The types to scane.</param>
         /// <param name="prefix">The prefix.</param>
-        public void ScanAssembly(Assembly theAssembly, string prefix)
+        public void ScanTypes(Type[] types, string prefix)
         {
-            try
+            foreach (Type t in types)
             {
-                InternalLogger.Debug("ScanAssembly('{0}','{1}','{2}')", theAssembly.FullName, typeof(TAttributeType), typeof(TBaseType));
-                foreach (Type t in theAssembly.SafeGetTypes())
+                try
                 {
                     this.RegisterType(t, prefix);
                 }
-            }
-            catch (Exception exception)
-            {
-                if (exception.MustBeRethrown())
+                catch (Exception exception)
                 {
-                    throw;
-                }
+                    if (exception.MustBeRethrown())
+                    {
+                        throw;
+                    }
 
-                InternalLogger.Error("Failed to add targets from '" + theAssembly.FullName + "': {0}", exception);
+                    InternalLogger.Error("Failed to add type '" + t.FullName + "': {0}", exception);
+                }
             }
         }
 

diff --git a/src/NLog/Config/IFactory.cs b/src/NLog/Config/IFactory.cs
@@ -43,7 +43,7 @@ internal interface IFactory
     {
         void Clear();
 
-        void ScanAssembly(Assembly theAssembly, string prefix);
+        void ScanTypes(Type[] type, string prefix);
 
         void RegisterType(Type type, string itemNamePrefix);
     }

diff --git a/src/NLog/Config/MethodFactory.cs b/src/NLog/Config/MethodFactory.cs
@@ -68,26 +68,25 @@ internal class MethodFactory<TClassAttributeType, TMethodAttributeType> : INamed
         /// and methods marked with <typeparamref name="TMethodAttributeType"/> and adds them 
         /// to the factory.
         /// </summary>
-        /// <param name="theAssembly">The assembly.</param>
+        /// <param name="types">The types to scan.</param>
         /// <param name="prefix">The prefix to use for names.</param>
-        public void ScanAssembly(Assembly theAssembly, string prefix)
+        public void ScanTypes(Type[] types, string prefix)
         {
-            try
+            foreach (Type t in types)
             {
-                InternalLogger.Debug("ScanAssembly('{0}','{1}','{2}')", theAssembly.FullName, typeof(TClassAttributeType), typeof(TMethodAttributeType));
-                foreach (Type t in theAssembly.SafeGetTypes())
+                try
                 {
                     this.RegisterType(t, prefix);
                 }
-            }
-            catch (Exception exception)
-            {
-                if (exception.MustBeRethrown())
+                catch (Exception exception)
                 {
-                    throw;
-                }
+                    if (exception.MustBeRethrown())
+                    {
+                        throw;
+                    }
 
-                InternalLogger.Error("Failed to add targets from '" + theAssembly.FullName + "': {0}", exception);
+                    InternalLogger.Error("Failed to add type '" + t.FullName + "': {0}", exception);
+                }
             }
         }