Context Navigation

Changeset 6356 for trunk

Timestamp:

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

Author:

epitzer

Message:

Added additional locks to improve concurrent persistence (#1544)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

-                      r5445
+                      r6356
     private static ConfigurationService instance;
+    private static object locker = new object();
     private readonly Dictionary<IFormat, Configuration> customConfigurations;
 …
     public static ConfigurationService Instance {
       get {
+        if (instance == null)
+          instance = new ConfigurationService();
+        return instance;
+        lock (locker) {
+          if (instance == null)
+            instance = new ConfigurationService();
+          return instance;
+        }
+      }
+    }

-                      r5445
+                      r6356
     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;
+    }

-                      r5445
+                      r6356
     /// <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) {

-                      r4065
+                      r6356
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.GeneticAlgorithm\3.3\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj">
+      <Project>{A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}</Project>
+      <Name>HeuristicLab.Algorithms.GeneticAlgorithm-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Persistence-3.3.csproj">
       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>

-                      r6342
+                      r6356
 using HeuristicLab.Persistence.Interfaces;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading.Tasks;
+using HeuristicLab.Algorithms.GeneticAlgorithm;
 namespace HeuristicLab.Persistence_33.Tests {
 …
+    }
+    [TestMethod]
+    public void ConcurrencyTest() {
+      int n = 20;
+      Task[] tasks = new Task[n];
+      for (int i = 0; i < n; i++) {
+        tasks[i] = Task.Factory.StartNew((idx) => {
+          byte[] data;
+          using(var stream = new MemoryStream()) {
+            XmlGenerator.Serialize(new GeneticAlgorithm(), stream);
+            data = stream.ToArray();
+          }
+        }, i);
+      }
+      Task.WaitAll(tasks);
+    }
     [ClassInitialize]

Note: See TracChangeset for help on using the changeset viewer.