Changeset 1379 for trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager

Timestamp:

03/20/09 13:56:55 (16 years ago)

Author:

kgrading

Message:

splitted the sendfinishedjob / snapshot method in two seperate methods, fixed the locking, added real memory management (#529)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager/ConfigManager.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager/ConfigManager.cs

@@ -100 +100 @@
     /// <returns></returns>
     public StatusCommons GetStatusForClientConsole() {
+      //Todo: Locking
       StatusCommons st = new StatusCommons();
       st.ClientGuid = hardwareInfo.ClientId;
@@ -113 +114 @@
       st.Jobs = new List<JobStatus>();
 
-      foreach (KeyValuePair<long, Executor> kvp in engines) {
-        Executor e = kvp.Value;
-        st.Jobs.Add(new JobStatus { JobId = e.JobId, Progress = e.Progress, Since = e.CreationTime });
+      lock (engines) {
+        foreach (KeyValuePair<long, Executor> kvp in engines) {
+          Executor e = kvp.Value;
+          st.Jobs.Add(new JobStatus { JobId = e.JobId, Progress = e.Progress, Since = e.CreationTime });
+        }
       }
       return st;      
@@ -123 +126 @@
       Dictionary<long,double> prog = new Dictionary<long,double>();
       Dictionary<long, Executor> engines = Core.GetExecutionEngines();
-      foreach (KeyValuePair<long, Executor> kvp in engines) {
-        Executor e = kvp.Value;
-        prog[e.JobId] = e.Progress;
+      lock (engines) {
+        foreach (KeyValuePair<long, Executor> kvp in engines) {
+          Executor e = kvp.Value;
+          prog[e.JobId] = e.Progress;
+        }
       }
       return prog;