Changeset 6419 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Timestamp:

06/16/11 00:06:54 (13 years ago)

Author:

cneumuel

Message:

#1233

• created events when statelog changed
• fixed memory leak in hiveengine
• extended timeout for long running transactions and database contexts (when jobdata is stored)
• replaced random guids in database with sequential guids for performance reasons
• minor fixes and cleanups

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Files:

• HeuristicLab.Clients.Hive-3.4.csproj (modified) (1 diff)
• HiveClient.cs (modified) (2 diffs)
• HiveJobs/EngineHiveJob.cs (modified) (1 diff)
• HiveJobs/HiveJob.cs (modified) (9 diffs)
• Jobs/EngineJob.cs (modified) (2 diffs)
• Jobs/ItemJob.cs (modified) (3 diffs)
• Jobs/OptimizerJob.cs (modified) (1 diff)
• RefreshableHiveExperiment.cs (modified) (5 diffs)
• ServiceClients/HiveExperiment.cs (modified) (5 diffs)
• StateLogList.cs (added)
• StateLogListList.cs (added)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -115 +115 @@
     <Compile Include="Jobs\ItemJob.cs" />
     <Compile Include="RefreshableHiveExperiment.cs" />
+    <Compile Include="StateLogList.cs" />
+    <Compile Include="StateLogListList.cs" />
     <Compile Include="ThreadSafeLog.cs" />
     <None Include="app_f005pc.config" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveClient.cs

@@ -297 +297 @@
           hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, groups.ToList());
         }
-      }, -1, "Failed to add job");
+      }, -1, "Failed to add job", log);
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
@@ -391 +391 @@
     /// If repetitions is -1, it is repeated infinitely.
     /// </summary>
-    public static void TryAndRepeat(Action action, int repetitions, string errorMessage) {
+    public static void TryAndRepeat(Action action, int repetitions, string errorMessage, ILog log = null) {
       while (true) {
         try { action(); return; }
         catch (Exception e) {
-          if (repetitions == 0)
-            throw new HiveException(errorMessage, e);
+          if (repetitions == 0) throw new HiveException(errorMessage, e);
+          if (log != null) log.LogMessage(string.Format("{0}: {1} - will try again!", errorMessage, e.ToString()));
           repetitions--;
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/EngineHiveJob.cs

@@ -71 +71 @@
       return jobData;
     }
+
+    public override void ClearData() {
+      base.ClearData();
+      this.ItemJob.InitialOperation = null;
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/HiveJob.cs

@@ -123 +123 @@
     protected bool syncJobsWithOptimizers = true;
 
+    public StateLogList StateLog {
+      get { return new StateLogList(this.job.StateLog); }
+    }
+
+    public StateLogListList ChildStateLogList {
+      get { return new StateLogListList(this.childHiveJobs.Select(x => x.StateLog)); }
+    }
+
     #region Constructors and Cloning
     public HiveJob() {
@@ -234 +242 @@
         OnToStringChanged();
         OnItemImageChanged();
+        OnStateLogChanged();
       }
     }
@@ -255 +264 @@
     }
 
-    #region Events
+    #region Event Handler
     public event EventHandler JobChanged;
     private void OnJobChanged() {
@@ -278 +287 @@
     private void OnIsFinishedJobDownloadedChanged() {
       var handler = IsFinishedJobDownloadedChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler StateLogChanged;
+    private void OnStateLogChanged() {
+      var handler = StateLogChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -371 +386 @@
     public event CollectionItemsChangedEventHandler<IItemTree<HiveJob>> CollectionReset;
     private void OnCollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
+      foreach (var item in e.Items) {
+        item.Value.StateLogChanged -= new EventHandler(ChildHiveJob_StateLogChanged);
+      }
       var handler = CollectionReset;
       if (handler != null) handler(this, ToCollectionItemsChangedEventArgs(e));
@@ -377 +395 @@
     public event CollectionItemsChangedEventHandler<IItemTree<HiveJob>> ItemsAdded;
     private void OnItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
+      foreach (var item in e.Items) {
+        item.Value.StateLogChanged += new EventHandler(ChildHiveJob_StateLogChanged);
+      }
       var handler = ItemsAdded;
       if (handler != null) handler(this, ToCollectionItemsChangedEventArgs(e));
@@ -383 +404 @@
     public event CollectionItemsChangedEventHandler<IItemTree<HiveJob>> ItemsRemoved;
     private void OnItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
+      foreach (var item in e.Items) {
+        item.Value.StateLogChanged -= new EventHandler(ChildHiveJob_StateLogChanged);
+      }
       var handler = ItemsRemoved;
       if (handler != null) handler(this, ToCollectionItemsChangedEventArgs(e));
@@ -389 +413 @@
     private static CollectionItemsChangedEventArgs<IItemTree<HiveJob>> ToCollectionItemsChangedEventArgs(CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
       return new CollectionItemsChangedEventArgs<IItemTree<HiveJob>>(e.Items.Select(x => x.Value), e.OldItems == null ? null : e.OldItems.Select(x => x.Value));
+    }
+
+    private void ChildHiveJob_StateLogChanged(object sender, EventArgs e) {
+      OnStateLogChanged();
     }
     #endregion
@@ -443 +471 @@
     /// Delete ItemJob
     /// </summary>
-    public void ClearData() {
+    public virtual void ClearData() {
       this.ItemJob.Item = null;
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/EngineJob.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Hive;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -65 +63 @@
     public override void Stop() {
       Item.Stop();
-    }
-    
-    public override void Resume(IEnumerable<IJob> childJobs) {
-      throw new NotImplementedException();
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/ItemJob.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using HeuristicLab.Common;
@@ -113 +112 @@
     public abstract void Stop();
 
-    public abstract void Resume(IEnumerable<IJob> childJobs);
-
     public event EventHandler JobStarted;
     protected virtual void OnJobStarted() {
@@ -139 +136 @@
     }
 
-    public event EventHandler<EventArgs<IJob>> NewChildJob;
-    protected virtual void OnNewChildJob(IJob job) {
-      EventHandler<EventArgs<IJob>> handler = NewChildJob;
-      if (handler != null) handler(this, new EventArgs<IJob>(job));
-    }
-
-    public event EventHandler WaitForChildJobs;
-    protected virtual void OnWaitForChildJobs() {
-      EventHandler handler = WaitForChildJobs;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler DeleteChildJobs;
-    protected virtual void OnDeleteChildJobs() {
-      EventHandler handler = DeleteChildJobs;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
     public event EventHandler ComputeInParallelChanged;
     protected virtual void OnComputeInParallelChanged() {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs

@@ -113 +113 @@
     public override void Stop() {
       Item.Stop();
-    }
-
-    public override void Resume(IEnumerable<IJob> childJobs) {
-      OnJobStopped();
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/RefreshableHiveExperiment.cs

@@ -88 +88 @@
     }
     private static object logLocker = new object();
-    
 
     #region Constructors and Cloning
@@ -220 +219 @@
       UpdateTotalExecutionTime();
       UpdateStatistics();
+      OnStateLogListChanged();
     }
 
@@ -269 +269 @@
     #endregion
 
+    #region HiveExperiment Events
     private void RegisterHiveExperimentEvents() {
       hiveExperiment.HiveJobsChanged += new EventHandler(hiveExperiment_HiveJobsChanged);
@@ -296 +297 @@
       }
     }
-
-    #region Events
+    #endregion
+
+    #region Event Handler
     public event EventHandler RefreshAutomaticallyChanged;
     private void OnRefreshAutomaticallyChanged() {
@@ -358 +360 @@
       if (handler != null) handler(this, new EventArgs<Exception>(exception));
     }
+
+    public event EventHandler StateLogListChanged;
+    private void OnStateLogListChanged() {
+      var handler = StateLogListChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

@@ -24 +24 @@
 using System.ComponentModel;
 using System.Linq;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -68 +69 @@
       set {
         if (hiveJobs != value) {
+          if (hiveJobs != null) DeregisterHiveJobsEvents();
           hiveJobs = value;
+          if (hiveJobs != null) RegisterHiveJobsEvents();
           OnHiveJobsChanged();
         }
@@ -89 +92 @@
       get { return progress; }
       set { this.progress = value; }
+    }
+
+    public StateLogListList StateLogList {
+      get { return new StateLogListList(this.GetAllHiveJobs().Select(x => x.StateLog)); }
     }
 
@@ -147 +154 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    public event EventHandler<CollectionItemsChangedEventArgs<HiveJob>> HiveJobsAdded;
+    private void OnHiveJobsAdded(CollectionItemsChangedEventArgs<HiveJob> e) {
+      var handler = HiveJobsAdded;
+      if (handler != null) handler(this, e);
+    }
+
+    public event EventHandler<CollectionItemsChangedEventArgs<HiveJob>> HiveJobsRemoved;
+    private void OnHiveJobsRemoved(CollectionItemsChangedEventArgs<HiveJob> e) {
+      var handler = HiveJobsRemoved;
+      if (handler != null) handler(this, e);
+    }
+
+    public event EventHandler<CollectionItemsChangedEventArgs<HiveJob>> HiveJobsReset;
+    private void OnHiveJobsReset(CollectionItemsChangedEventArgs<HiveJob> e) {
+      var handler = HiveJobsReset;
+      if (handler != null) handler(this, e);
+    }
+
+    public event EventHandler StateLogListChanged;
+    private void OnStateLogListChanged() {
+      var handler = StateLogListChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    #endregion
+
+    #region HiveJobs Events
+    private void RegisterHiveJobsEvents() {
+      this.hiveJobs.ItemsAdded += new CollectionItemsChangedEventHandler<HiveJob>(hiveJobs_ItemsAdded);
+      this.hiveJobs.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveJob>(hiveJobs_ItemsRemoved);
+      this.hiveJobs.CollectionReset += new CollectionItemsChangedEventHandler<HiveJob>(hiveJobs_CollectionReset);
+    }
+
+    private void DeregisterHiveJobsEvents() {
+      this.hiveJobs.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveJob>(hiveJobs_ItemsAdded);
+      this.hiveJobs.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveJob>(hiveJobs_ItemsRemoved);
+      this.hiveJobs.CollectionReset -= new CollectionItemsChangedEventHandler<HiveJob>(hiveJobs_CollectionReset);
+    }
+
+    private void hiveJobs_CollectionReset(object sender, CollectionItemsChangedEventArgs<HiveJob> e) {
+      foreach (var item in e.Items) {
+        item.StateLogChanged -= new EventHandler(item_StateLogChanged);
+      }
+      OnHiveJobsReset(e);
+    }
+
+    private void hiveJobs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<HiveJob> e) {
+      foreach (var item in e.Items) {
+        item.StateLogChanged -= new EventHandler(item_StateLogChanged);
+      }
+      OnHiveJobsRemoved(e);
+    }
+
+    private void hiveJobs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<HiveJob> e) {
+      foreach (var item in e.Items) {
+        item.StateLogChanged += new EventHandler(item_StateLogChanged);
+      }
+      OnHiveJobsAdded(e);
+    }
+    
+    private void item_StateLogChanged(object sender, EventArgs e) {
+      OnStateLogListChanged();
+    }
     #endregion
 
@@ -171 +241 @@
 
     public IEnumerable<HiveJob> GetAllHiveJobs() {
+      if (hiveJobs == null) return Enumerable.Empty<HiveJob>();
+
       var jobs = new List<HiveJob>();
       foreach (HiveJob job in HiveJobs) {