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

Timestamp:

07/30/10 13:56:28 (14 years ago)

Author:

cneumuel

Message:

Stabilization of Hive, Improvement HiveExperiment GUI (#1115)

Location:

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

Files:

• HeuristicLab.Hive.Server.Console-3.3.csproj (modified) (1 diff)
• JobDataFetcher.cs (modified) (7 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj

@@ -43 +43 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>

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

@@ -8 +8 @@
 using System.Collections;
 using System.Threading;
+using HeuristicLab.Hive.Contracts.Interfaces;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -15 +16 @@
     public IEnumerable<State> PollStates {
       get { return pollStates; }
-    } 
+    }
 
     public event EventHandler NewDataAvailable;
@@ -24 +25 @@
 
     public List<JobDto> CachedJobs { get; set; }
+
+    private IJobManager jobManager;
 
     public double Interval {
@@ -36 +39 @@
       }
       set {
-        Console.WriteLine("Setting for " + PollStates + " changed to: " + value);        
-        _nrOfEntriesOnPage = value;        
+        Console.WriteLine("Setting for " + PollStates + " changed to: " + value);
+        _nrOfEntriesOnPage = value;
         Thread t = new Thread(new ThreadStart(DoUpdateRun));
-        t.Start();        
+        t.Start();
       }
-    }    
+    }
     public int CurrentPage { get; set; }
 
@@ -50 +53 @@
       CurrentPage = 0;
       pollStates.AddRange(states);
+      jobManager = ServiceLocator.GetJobManager();
       timer = new System.Timers.Timer();
       timer.Interval = 5000;
-      timer.Elapsed += new ElapsedEventHandler(Timer_Elapsed);      
+      timer.Elapsed += new ElapsedEventHandler(Timer_Elapsed);
     }
 
@@ -67 +71 @@
         CurrentPage--;
       DoUpdateRun();
-    } 
+    }
 
     private void Timer_Elapsed(object sender, ElapsedEventArgs e) {
@@ -77 +81 @@
       // todo: make access to PollStates thread-safe!
       // * 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);
+      // * made public property PollStates an IEnumerable to be immutable -> didn't help
+      // * using for loop
+
+      State[] pollStatesCopy = PollStates.ToArray();
+      for (int i = 0; i < pollStatesCopy.Length; i++) {
+        ResponseList<JobDto> resList = jobManager.GetAllJobsWithFilter(pollStatesCopy[i], CurrentPage * NrOfEntriesOnPage, NrOfEntriesOnPage);
+        if (resList.Success) {
+          if (resList.List.Count == 0) {
+            if (CurrentPage > 0) {
+              CurrentPage--;
             }
+          } else {
+            CachedJobs = new List<JobDto>();
+            CachedJobs.AddRange(resList.List);
           }
         }
-        if (NewDataAvailable != null)
-          NewDataAvailable(this, new EventArgs());
+      }
+      if (NewDataAvailable != null) {
+        NewDataAvailable(this, new EventArgs());
       }
     }