Changeset 9855

Timestamp:

08/06/13 16:36:11 (11 years ago)

Author:

jkarder

Message:

#2095

• added FieldInfo cache
• refactored GetAllFields to work iteratively

Location:

trunk/sources/HeuristicLab.Common/3.3

Files:

• ObjectExtensions.cs (modified) (4 diffs)
• TypeExtensions.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -38 +38 @@
       if (obj == null) return Enumerable.Empty<object>();
       if (excludedMembers == null) excludedMembers = new HashSet<object>();
+      var fieldInfos = new Dictionary<Type, FieldInfo[]>();
 
       var objects = new HashSet<object>();
@@ -47 +48 @@
         objects.Add(current);
 
-        foreach (object o in GetChildObjects(current, excludedMembers, excludeStaticMembers)) {
+        foreach (object o in GetChildObjects(current, excludedMembers, excludeStaticMembers, fieldInfos)) {
           if (o == null) continue;
           if (ExcludeType(o.GetType())) continue;
@@ -80 +81 @@
     }
 
-    private static IEnumerable<object> GetChildObjects(object obj, HashSet<object> excludedMembers, bool excludeStaticMembers) {
+    private static IEnumerable<object> GetChildObjects(object obj, HashSet<object> excludedMembers, bool excludeStaticMembers, Dictionary<Type, FieldInfo[]> fieldInfos) {
       Type type = obj.GetType();
 
@@ -111 +112 @@
         }
       } else {
-        foreach (FieldInfo f in type.GetAllFields()) {
+        if (!fieldInfos.ContainsKey(type))
+          fieldInfos[type] = type.GetAllFields().ToArray();
+        foreach (FieldInfo f in fieldInfos[type]) {
           if (excludeStaticMembers && f.IsStatic) continue;
           object fieldValue;

trunk/sources/HeuristicLab.Common/3.3/TypeExtensions.cs

@@ -49 +49 @@
 
     public static IEnumerable<FieldInfo> GetAllFields(this Type type) {
-      foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic))
-        yield return field;
-
-      foreach (var field in type.GetFields(BindingFlags.Static | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic))
-        yield return field;
-
-      if (type.BaseType != null) {
-        foreach (var field in type.BaseType.GetAllFields())
+      while (type != null) {
+        foreach (var field in type.GetFields(BindingFlags.Static | BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic))
           yield return field;
+        type = type.BaseType;
       }
     }