Changeset 6356 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

06/04/11 17:16:37 (14 years ago)

Author:

epitzer

Message:

Added additional locks to improve concurrent persistence (#1544)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers

Files:

• NumberEnumerable2StringSerializer.cs (modified) (1 diff)
• Storable/StorableReflection.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs

@@ -46 +46 @@
 
     private static readonly Dictionary<Type, Type> interfaceCache = new Dictionary<Type, Type>();
+    private static readonly object locker = new object();
 
     public Type GetGenericEnumerableInterface(Type type) {
-      if (interfaceCache.ContainsKey(type))
-        return interfaceCache[type];
-      foreach (Type iface in type.GetInterfaces()) {
-        if (iface.IsGenericType &&
-          iface.GetGenericTypeDefinition() == typeof(IEnumerable<>) &&
-          numberConverter.CanSerialize(iface.GetGenericArguments()[0])) {
-          interfaceCache.Add(type, iface);
-          return iface;
+      lock (locker) {
+        if (interfaceCache.ContainsKey(type))
+          return interfaceCache[type];
+        foreach (Type iface in type.GetInterfaces()) {
+          if (iface.IsGenericType &&
+            iface.GetGenericTypeDefinition() == typeof(IEnumerable<>) &&
+            numberConverter.CanSerialize(iface.GetGenericArguments()[0])) {
+            interfaceCache.Add(type, iface);
+            return iface;
+          }
         }
+        interfaceCache.Add(type, null);
       }
-      interfaceCache.Add(type, null);
       return null;
     }

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

@@ -124 +124 @@
     /// <param name="storableMemberInfos"></param>
     /// <returns></returns>
-    private static IEnumerable<StorableMemberInfo> DisentangleNameMapping(
-        IEnumerable<StorableMemberInfo> storableMemberInfos) {
+    private static IEnumerable<StorableMemberInfo> DisentangleNameMapping(IEnumerable<StorableMemberInfo> storableMemberInfos) {
       var nameGrouping = new Dictionary<string, List<StorableMemberInfo>>();
       foreach (StorableMemberInfo storable in storableMemberInfos) {