Changeset 3031 for trunk/sources

Timestamp:

03/15/10 12:25:55 (15 years ago)

Author:

epitzer

Message:

collect all storable caches into storable serializer to reduce prolonged memory usage (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Core/DataMemberAccessor.cs (added)
• Default/CompositeSerializers/Storable/DataMemberAccessor.cs (deleted)
• Default/CompositeSerializers/Storable/StorableClassAttribute.cs (modified) (2 diffs)
• Default/CompositeSerializers/Storable/StorableHookAttribute.cs (modified) (3 diffs)
• Default/CompositeSerializers/Storable/StorableReflection.cs (modified) (5 diffs)
• Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (6 diffs)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassAttribute.cs

@@ -16 +16 @@
     /// Specify how members are selected for serialization.
     /// </summary>
-    public StorableClassType Type { get; set; }
+    public StorableClassType Type { get; private set; }
 
     /// <summary>
@@ -31 +31 @@
     /// <see cref="StorableClassType.MarkedOnly"/>.
     /// </summary>
-    public StorableClassAttribute() {
-    }
+    public StorableClassAttribute() { }
 
   }

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableHookAttribute.cs

@@ -19 +19 @@
   /// </summary>
   [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
-  public sealed class StorableHookAttribute : Attribute {
-
-    private sealed class HookDesignator {
-      public Type Type { get; set; }
-      public HookType HookType { get; set; }
-      public HookDesignator() { }
-      public HookDesignator(Type type, HookType hookType) {
-        Type = type;
-        HookType = HookType;
-      }
-    }
+  public sealed class StorableHookAttribute : Attribute {    
 
     private readonly HookType hookType;
@@ -40 +30 @@
     }
 
-
     /// <summary>
     /// Mark method as <c>StorableSerializer</c> hook to be run
@@ -48 +37 @@
     public StorableHookAttribute(HookType hookType) {
       this.hookType = hookType;
-    }
-
-    private static readonly BindingFlags declaredInstanceMembers =
-      BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly;
-
-    private static readonly object[] emptyArgs = new object[] { };
-
-    private static Dictionary<HookDesignator, List<MethodInfo>> hookCache =
-      new Dictionary<HookDesignator, List<MethodInfo>>();
-
-
-    /// <summary>
-    /// Invoke <c>hookType</c> hook on <c>obj</c>.
-    /// </summary>
-    /// <param name="hookType">Type of the hook.</param>
-    /// <param name="obj">The object.</param>
-    public static void InvokeHook(HookType hookType, object obj) {
-      if (obj == null)
-        throw new ArgumentNullException("Cannot invoke hooks on null");
-      foreach (MethodInfo mi in GetHooks(hookType, obj.GetType())) {
-        mi.Invoke(obj, emptyArgs);
-      }
     }    
-
-    private static IEnumerable<MethodInfo> GetHooks(HookType hookType, Type type) {
-      lock (hookCache) {
-        List<MethodInfo> hooks;
-        var designator = new HookDesignator(type, hookType);
-        hookCache.TryGetValue(designator, out hooks);
-        if (hooks != null)
-          return hooks;
-        hooks = new List<MethodInfo>(CollectHooks(hookType, type));
-        hookCache.Add(designator, hooks);
-        return hooks;
-      }
-    }
-
-    private static IEnumerable<MethodInfo> CollectHooks(HookType hookType, Type type) {  
-      if (type.BaseType != null)
-        foreach (var mi in CollectHooks(hookType, type.BaseType))
-          yield return mi;
-      foreach (MemberInfo memberInfo in type.GetMembers(declaredInstanceMembers)) {
-        foreach (StorableHookAttribute hook in memberInfo.GetCustomAttributes(typeof(StorableHookAttribute), false)) {
-          if (hook != null && hook.HookType == hookType) {
-            MethodInfo methodInfo = memberInfo as MethodInfo;
-            if (memberInfo.MemberType != MemberTypes.Method || memberInfo == null)
-              throw new ArgumentException("Storable hooks must be methods");
-            yield return methodInfo;
-          }
-        }
-      }
-    }
-
   }
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs

@@ -17 +17 @@
       BindingFlags.NonPublic |
       BindingFlags.DeclaredOnly;
-
 
     public static IEnumerable<StorableMemberInfo> GenerateStorableMembers(Type type, bool inherited) {
@@ -43 +42 @@
     }
 
+    public static bool IsEmptyOrStorableType(Type type, bool recusrive) {
+      if (IsEmptyType(type, recusrive)) return true;
+      if (!HasStorableClassAttribute(type)) return false;
+      return !recusrive || type.BaseType == null || IsEmptyOrStorableType(type.BaseType, true);
+    }
+
+    public static IEnumerable<MethodInfo> CollectHooks(HookType hookType, Type type) {
+      if (type.BaseType != null)
+        foreach (var mi in CollectHooks(hookType, type.BaseType))
+          yield return mi;
+      foreach (MemberInfo memberInfo in type.GetMembers(DECLARED_INSTANCE_MEMBERS)) {
+        foreach (StorableHookAttribute hook in memberInfo.GetCustomAttributes(typeof(StorableHookAttribute), false)) {
+          if (hook != null && hook.HookType == hookType) {
+            MethodInfo methodInfo = memberInfo as MethodInfo;
+            if (memberInfo.MemberType != MemberTypes.Method || memberInfo == null)
+              throw new ArgumentException("Storable hooks must be methods");
+            yield return methodInfo;
+          }
+        }
+      }
+    }
+
+    #region [Storable] helpers
+
     private static void AddMarkedMembers(Type type, List<StorableMemberInfo> storableMembers) {
       foreach (MemberInfo memberInfo in type.GetMembers(DECLARED_INSTANCE_MEMBERS)) {
@@ -60 +83 @@
     }
 
-    private static StorableClassAttribute GetStorableClassAttribute(Type type) {
-      return (StorableClassAttribute)type
-        .GetCustomAttributes(typeof(StorableClassAttribute), false)
-        .SingleOrDefault();
-    }
 
     private static IEnumerable<StorableMemberInfo> DisentangleNameMapping(
@@ -107 +125 @@
     }
 
-    public static bool IsEmptyOrStorableType(Type type, bool recusrive) {
-      if (IsEmptyType(type, recusrive)) return true;
-      if (!HastStorableClassAttribute(type)) return false;
-      return !recusrive || type.BaseType == null || IsEmptyOrStorableType(type.BaseType, true);
+    #endregion
+
+    #region [StorableClass] helpers
+
+    private static StorableClassAttribute GetStorableClassAttribute(Type type) {
+      return (StorableClassAttribute)type
+        .GetCustomAttributes(typeof(StorableClassAttribute), false)
+        .SingleOrDefault();
+    }    
+
+    private static bool HasStorableClassAttribute(Type type) {
+      return type.GetCustomAttributes(typeof(StorableClassAttribute), false).Length > 0;
     }
 
-    private static bool HastStorableClassAttribute(Type type) {
-      return type.GetCustomAttributes(typeof(StorableClassAttribute), false).Length > 0;
-    }
+    #endregion
+
+    #region other helpers
 
     private static bool IsEmptyType(Type type, bool recursive) {
@@ -136 +162 @@
       return pi.CanWrite;
     }
+
+    #endregion
+
   }
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -43 +43 @@
 
     public IEnumerable<Tag> CreateMetaInfo(object o) {
-      StorableHookAttribute.InvokeHook(HookType.BeforeSerialization, o);
+      InvokeHook(HookType.BeforeSerialization, o);
       return new Tag[] { };
     }
@@ -79 +79 @@
         }
       }
-      StorableHookAttribute.InvokeHook(HookType.AfterDeserialization, instance);
+      InvokeHook(HookType.AfterDeserialization, instance);
     }
 
@@ -89 +89 @@
       BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
 
+    private static readonly object[] emptyArgs = new object[] { };
+
     private sealed class TypeQuery {
       public Type Type { get; private set; }
@@ -95 +97 @@
         this.Type = type;
         this.Inherited = inherited;
+      }
+    }
+
+    private sealed class HookDesignator {
+      public Type Type { get; set; }
+      public HookType HookType { get; set; }
+      public HookDesignator() { }
+      public HookDesignator(Type type, HookType hookType) {
+        Type = type;
+        HookType = HookType;
       }
     }
@@ -107 +119 @@
     private Dictionary<Type, ConstructorInfo> constructorCache =
       new Dictionary<Type, ConstructorInfo>();
+    
+    private Dictionary<HookDesignator, List<MethodInfo>> hookCache =
+      new Dictionary<HookDesignator, List<MethodInfo>>();
 
     #endregion
@@ -150 +165 @@
     }
 
+    private void InvokeHook(HookType hookType, object obj) {
+      if (obj == null)
+        throw new ArgumentNullException("Cannot invoke hooks on null");
+      foreach (MethodInfo mi in GetHooks(hookType, obj.GetType())) {
+        mi.Invoke(obj, emptyArgs);
+      }
+    }
+
+    private IEnumerable<MethodInfo> GetHooks(HookType hookType, Type type) {
+      lock (hookCache) {
+        List<MethodInfo> hooks;
+        var designator = new HookDesignator(type, hookType);
+        hookCache.TryGetValue(designator, out hooks);
+        if (hooks != null)
+          return hooks;
+        hooks = new List<MethodInfo>(StorableReflection.CollectHooks(hookType, type));
+        hookCache.Add(designator, hooks);
+        return hooks;
+      }
+    }
+
     #endregion
+
+    
     
   }

trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -122 +122 @@
     <Compile Include="Default\CompositeSerializers\Storable\StorableMemberInfo.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableClassType.cs" />
-    <Compile Include="Default\CompositeSerializers\Storable\DataMemberAccessor.cs" />
+    <Compile Include="Core\DataMemberAccessor.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableClassAttribute.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableAttribute.cs" />