Changeset 6460 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs

Timestamp:

06/21/11 11:11:38 (13 years ago)

Author:

epitzer

Message:

Correct locking construct for external evaluation on multiple clients and simplify string formatting (#1526)

File:

• trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (3 diffs)

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

@@ -59 +59 @@
     #region Fields
     protected HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
-    protected object clientLock = new object();
-    protected AutoResetEvent clientAvailable = new AutoResetEvent(false);
+    protected object clientLock = new object();    
     #endregion
 
@@ -109 +108 @@
         client = Clients.CheckedItems.FirstOrDefault(c => !activeClients.Contains(c));
         while (client == null && Clients.Count > 0) {
-          Monitor.Exit(clientLock);
-          clientAvailable.WaitOne();
-          Monitor.Enter(clientLock);
+          Monitor.Wait(clientLock);
           client = Clients.CheckedItems.FirstOrDefault(c => !activeClients.Contains(c));
         }
@@ -122 +119 @@
         lock (clientLock) {
           activeClients.Remove(client);
-          clientAvailable.Set();
+          Monitor.PulseAll(clientLock);
         }
       }