Changeset 4120 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console

Timestamp:

07/29/10 16:58:35 (14 years ago)

Author:

cneumuel

Message:

further improvement and stabilisation of HiveExperiment (#1115)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs (modified) (3 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs

@@ -11 +11 @@
 namespace HeuristicLab.Hive.Server.ServerConsole {
   public class JobDataFetcher {
-    public List<State> PollStates { get; set; }    
+    private List<State> pollStates;
+
+    public IEnumerable<State> PollStates {
+      get { return pollStates; }
+    } 
 
     public event EventHandler NewDataAvailable;
 
     private System.Timers.Timer timer;
+
+    private static object locker = new object();
 
     public List<JobDto> CachedJobs { get; set; }
@@ -39 +45 @@
 
     public JobDataFetcher(IEnumerable<State> states, int nrOfEntries) {
-      PollStates = new List<State>();
+      pollStates = new List<State>();
       CachedJobs = new List<JobDto>();
       NrOfEntriesOnPage = nrOfEntries;
       CurrentPage = 0;
-      PollStates.AddRange(states);
+      pollStates.AddRange(states);
       timer = new System.Timers.Timer();
       timer.Interval = 5000;
@@ -70 +76 @@
       // [chn] Exception occured here: PollStates enumeration changed!
       // todo: make access to PollStates thread-safe!
-      foreach (State stat in PollStates) {
-        ResponseList<JobDto> resList = ServiceLocator.GetJobManager().GetAllJobsWithFilter(stat, CurrentPage * NrOfEntriesOnPage,
-                                                            NrOfEntriesOnPage);
-        if (resList.Success) {
-          if (resList.List.Count == 0) {
-            if (CurrentPage > 0) {
-              CurrentPage--;
+      // * added lock on locker -> didn't help
+      // * made public property PollStates an IEnumerable to be immutable -> lets see
+      lock (locker) {
+        foreach (State stat in PollStates) {
+          ResponseList<JobDto> resList = ServiceLocator.GetJobManager().GetAllJobsWithFilter(stat, CurrentPage * NrOfEntriesOnPage,
+                                                              NrOfEntriesOnPage);
+          if (resList.Success) {
+            if (resList.List.Count == 0) {
+              if (CurrentPage > 0) {
+                CurrentPage--;
+              }
+            } else {
+              CachedJobs = new List<JobDto>();
+              CachedJobs.AddRange(resList.List);
             }
-          } else {
-            CachedJobs = new List<JobDto>();
-            CachedJobs.AddRange(resList.List);
           }
         }
+        if (NewDataAvailable != null)
+          NewDataAvailable(this, new EventArgs());
       }
-      if (NewDataAvailable != null)
-        NewDataAvailable(this, new EventArgs());
     }
   }