Changeset 1893 for trunk/sources

Timestamp:

05/25/09 18:04:44 (16 years ago)

Author:

epitzer

Message:

Avoid recompiling regex during string parsing and cache storable attribues for faster saving. (#646)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default

Files:

• CompositeSerializers/Storable/StorableAttribute.cs (modified) (3 diffs)
• Xml/Primitive/String2XmlSerializer.cs (modified) (1 diff)

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

@@ -20 +20 @@
       BindingFlags.DeclaredOnly;
 
+    private static Dictionary<KeyValuePair<Type, bool>, IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>>> memberCache =
+      new Dictionary<KeyValuePair<Type, bool>, IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>>>();
+
     public static IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>> GetStorableMembers(Type type) {
       return GetStorableMembers(type, true);
@@ -26 +29 @@
     public static IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>>
         GetStorableMembers(Type type, bool inherited) {
+      var query = new KeyValuePair<Type, bool>(type, inherited);
+      if (memberCache.ContainsKey(query))
+        return memberCache[query];
+      IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>> storablesMembers = GenerateStorableMembers(type, inherited);
+      memberCache[query] = storablesMembers;
+      return storablesMembers;
+    }
+
+    public static IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>>
+        GenerateStorableMembers(Type type, bool inherited) {
+      List<KeyValuePair<StorableAttribute, MemberInfo>> storableMembers =
+        new List<KeyValuePair<StorableAttribute, MemberInfo>>();
       if (inherited && type.BaseType != null)
-        foreach (var pair in GetStorableMembers(type.BaseType))
-          yield return pair;
+        storableMembers.AddRange(GenerateStorableMembers(type.BaseType, true));        
       foreach (MemberInfo memberInfo in type.GetMembers(instanceMembers)) {
         foreach (object attribute in memberInfo.GetCustomAttributes(false)) {
@@ -34 +48 @@
             attribute as StorableAttribute;
           if (storableAttribute != null) {
-            yield return new KeyValuePair<StorableAttribute, MemberInfo>(storableAttribute, memberInfo);
+            storableMembers.Add(new KeyValuePair<StorableAttribute, MemberInfo>(storableAttribute, memberInfo));
           }
         }
       }
+      return storableMembers;
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/String2XmlSerializer.cs

@@ -19 +19 @@
     }
 
+    private static Regex re = new Regex(@"<!\[CDATA\[((?:[^]]|\](?!\]>))*)\]\]>", RegexOptions.Singleline);
+
     public override string Parse(XmlString x) {
       StringBuilder sb = new StringBuilder();
-      Regex re = new Regex(@"<!\[CDATA\[((?:[^]]|\](?!\]>))*)\]\]>", RegexOptions.Singleline);
       foreach (Match m in re.Matches(x.Data)) {
         sb.Append(m.Groups[1]);