Changeset 6188 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation

Timestamp:

05/12/11 15:38:45 (14 years ago)

Author:

epitzer

Message:

improve synchronization of cache (#1516)

• set locks per instance instead of static
• remove failed evaluations from active set

File:

• trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/EvaluationCache.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/EvaluationCache.cs

@@ -74 +74 @@
     private LinkedList<CacheEntry> list;
     private Dictionary<CacheEntry, LinkedListNode<CacheEntry>> index;
-    private static HashSet<string> activeEvaluations = new HashSet<string>();
-    private static object cacheLock = new object();
-    private static object evaluationLock = new object();
-    private static AutoResetEvent evaluationDone = new AutoResetEvent(false);
+    private HashSet<string> activeEvaluations = new HashSet<string>();
+    private object cacheLock = new object();
+    private object evaluationLock = new object();
+    private AutoResetEvent evaluationDone = new AutoResetEvent(false);
     #endregion
 
@@ -250 +250 @@
           Monitor.Exit(evaluationLock);
           OnActiveEvalutionsChanged();
-          entry.Value = evaluate(message);
-          lock (cacheLock) {
-            index[entry] = list.AddLast(entry);
+          try {
+            entry.Value = evaluate(message);
+            lock (cacheLock) {
+              index[entry] = list.AddLast(entry);
+            }
+            Trim();
+          } finally {
+            lock (evaluationLock) {
+              activeEvaluations.Remove(entry.Key);
+              evaluationDone.Set();
+            }
+            OnActiveEvalutionsChanged();
           }
-          lock (evaluationLock) {
-            activeEvaluations.Remove(entry.Key);
-            evaluationDone.Set();
-          }
-          OnActiveEvalutionsChanged();
-          Trim();
           return entry.Value;
         }