Changeset 7520

Timestamp:

02/24/12 14:04:43 (13 years ago)

Author:

abeham

Message:

#1774:

• improved performance of type discovery by moving compatibility check further up the chain (deep cloneable unit test time reduced from 32s to 18s)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Files:

• LightweightApplicationManager.cs (modified) (4 diffs)
• SandboxApplicationManager.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/LightweightApplicationManager.cs

@@ -75 +75 @@
       foreach (Type t in GetTypes(type)) {
         object instance = null;
-        try { instance = Activator.CreateInstance(t); }
-        catch { }
+        try { instance = Activator.CreateInstance(t); } catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -127 +126 @@
 
         var buildTypes = from t in assembly.GetTypes()
+                         where CheckTypeCompatibility(type, t)
                          where !IsNonDiscoverableType(t)
                          where onlyInstantiable == false ||
                                (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
-                         where CheckTypeCompatibility(type, t)
                          select BuildType(t, type);
 
@@ -136 +135 @@
                where includeGenericTypeDefinitions || !t.IsGenericTypeDefinition
                select t;
-      }
-      catch (TypeLoadException) {
+      } catch (TypeLoadException) {
         return Enumerable.Empty<Type>();
-      }
-      catch (ReflectionTypeLoadException) {
+      } catch (ReflectionTypeLoadException) {
         return Enumerable.Empty<Type>();
       }
@@ -174 +171 @@
           if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
             return true;
-        }
-        catch (Exception) { }
+        } catch (Exception) { }
       }
       return false;

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs

@@ -119 +119 @@
       try {
         runnablePlugin.Run();
-      }
-      finally {
+      } finally {
         // unload plugins in reverse order
         foreach (var plugin in loadedPlugins.Reverse<IPlugin>()) {
@@ -150 +149 @@
       foreach (Type t in GetTypes(typeof(T), plugin, onlyInstantiable: true, includeGenericTypeDefinitions: false)) {
         T instance = null;
-        try { instance = (T)Activator.CreateInstance(t); }
-        catch { }
+        try { instance = (T)Activator.CreateInstance(t); } catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -166 +164 @@
       foreach (Type t in GetTypes(typeof(T), asm, onlyInstantiable: true, includeGenericTypeDefinitions: false)) {
         T instance = null;
-        try { instance = (T)Activator.CreateInstance(t); }
-        catch { }
+        try { instance = (T)Activator.CreateInstance(t); } catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -191 +188 @@
       foreach (Type t in GetTypes(type, onlyInstantiable: true, includeGenericTypeDefinitions: false)) {
         object instance = null;
-        try { instance = Activator.CreateInstance(t); }
-        catch { }
+        try { instance = Activator.CreateInstance(t); } catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -262 +258 @@
     private static IEnumerable<Type> GetTypes(Type type, Assembly assembly, bool onlyInstantiable, bool includeGenericTypeDefinitions) {
       var buildTypes = from t in assembly.GetTypes()
+                       where CheckTypeCompatibility(type, t)
                        where !IsNonDiscoverableType(t)
                        where onlyInstantiable == false ||
                              (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
-                       where CheckTypeCompatibility(type, t)
                        select BuildType(t, type);
 
@@ -303 +299 @@
           if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
             return true;
-        }
-        catch (Exception) { }
+        } catch (Exception) { }
       }
       return false;