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

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/Jobs

Files:

• EngineJob.cs (modified) (2 diffs)
• ItemJob.cs (modified) (3 diffs)
• OptimizerJob.cs (modified) (1 diff)

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