Changeset 6178 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJob.cs

Timestamp:

05/10/11 17:58:59 (13 years ago)

Author:

cneumuel

Message:

#1233

• added semaphores to ensure an appdomain is never unloaded when the start method has not finished
• HiveEngine uploading and downloading of jobs works and is displayed in the view

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJob.cs (modified) (16 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
@@ -55 +56 @@
     }
 
+    [Storable]
     protected Job job;
     public Job Job {
@@ -60 +62 @@
       set {
         if (job != value) {
+          DeregisterJobEvents();
           job = value;
+          RegisterJobEvents();
+          itemJobDownloaded = false;
           OnJobChanged();
           OnToStringChanged();
           OnItemImageChanged();
         }
+        
       }
     }
 
     [Storable]
-    protected ItemJob jobItem;
-    public ItemJob JobItem {
-      get { return jobItem; }
+    protected ItemJob itemJob;
+    public ItemJob ItemJob {
+      get { return itemJob; }
       internal set {
-        if (jobItem != null && syncJobsWithOptimizers) {
+        if (itemJob != null && syncJobsWithOptimizers) {
           this.childHiveJobs.Clear();
         }
-        if (jobItem != value) {
-          DergisterJobItemsEvents();
-          jobItem = value;
-          RegisterJobItemEvents();
+        if (itemJob != value) {
+          DergisterItemJobEvents();
+          itemJob = value;
+          RegisterItemJobEvents();
           OnJobItemChanged();
-        }
-      }
+          itemJobDownloaded = true;
+        }
+      }
+    }
+
+    // job downloaded since last status change
+    [Storable]
+    private bool itemJobDownloaded = false;
+    public bool ItemJobDownloaded {
+      get { return itemJobDownloaded; } 
     }
 
@@ -106 +120 @@
     }
 
-    public HiveJob(ItemJob jobItem, bool autoCreateChildHiveJobs)
+    public HiveJob(ItemJob itemJob, bool autoCreateChildHiveJobs)
       : this() {
       this.syncJobsWithOptimizers = autoCreateChildHiveJobs;
-      this.JobItem = jobItem;
+      this.ItemJob = itemJob;
       this.syncJobsWithOptimizers = true;
     }
@@ -117 +131 @@
       this.Job = job;
       try {
-        this.JobItem = PersistenceUtil.Deserialize<ItemJob>(jobData.Data);
+        this.ItemJob = PersistenceUtil.Deserialize<ItemJob>(jobData.Data);
       }
       catch {
-        this.JobItem = null;
+        this.ItemJob = null;
       }
       this.childHiveJobs = new ItemList<HiveJob>();
@@ -130 +144 @@
       : base(original, cloner) {
       this.Job = cloner.Clone(original.job);
-      this.JobItem = cloner.Clone(original.JobItem);
+      this.ItemJob = cloner.Clone(original.ItemJob);
       this.childHiveJobs = cloner.Clone(original.childHiveJobs);
       this.syncJobsWithOptimizers = original.syncJobsWithOptimizers;
+      this.itemJobDownloaded = original.itemJobDownloaded;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -141 +156 @@
     protected virtual void UpdateChildHiveJobs() { }
 
-    protected virtual void RegisterJobItemEvents() {
-      if (JobItem != null) {
-        JobItem.ComputeInParallelChanged += new EventHandler(JobItem_ComputeInParallelChanged);
-        JobItem.ToStringChanged += new EventHandler(JobItem_ToStringChanged);
-      }
-    }
-    protected virtual void DergisterJobItemsEvents() {
-      if (JobItem != null) {
-        JobItem.ComputeInParallelChanged -= new EventHandler(JobItem_ComputeInParallelChanged);
-        JobItem.ToStringChanged -= new EventHandler(JobItem_ToStringChanged);
+    protected virtual void RegisterItemJobEvents() {
+      if (ItemJob != null) {
+        ItemJob.ComputeInParallelChanged += new EventHandler(JobItem_ComputeInParallelChanged);
+        ItemJob.ToStringChanged += new EventHandler(JobItem_ToStringChanged);
+      }
+    }
+    protected virtual void DergisterItemJobEvents() {
+      if (ItemJob != null) {
+        ItemJob.ComputeInParallelChanged -= new EventHandler(JobItem_ComputeInParallelChanged);
+        ItemJob.ToStringChanged -= new EventHandler(JobItem_ToStringChanged);
       }
     }
@@ -168 +183 @@
       this.OnToStringChanged();
     }
-    
+
     protected virtual void JobItem_ComputeInParallelChanged(object sender, EventArgs e) {
-      if (JobItem != null && syncJobsWithOptimizers) {
+      if (ItemJob != null && syncJobsWithOptimizers) {
         this.UpdateChildHiveJobs();
       }
@@ -180 +195 @@
 
     public override string ToString() {
-      if (jobItem != null) {
-        return jobItem.ToString();
+      if (itemJob != null) {
+        return itemJob.ToString();
       } else {
         return base.ToString();
@@ -196 +211 @@
         job.Command = lightweightJob.Command;
         job.LastJobDataUpdate = lightweightJob.LastJobDataUpdate;
-        
+
         OnJobStateChanged();
         OnToStringChanged();
@@ -210 +225 @@
     /// </param>
     public virtual JobData GetAsJobData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
-      plugins = null;
-      return null;
+      plugins = new List<IPluginDescription>();
+      if (this.itemJob == null)
+        return null;
+
+      IEnumerable<Type> usedTypes;
+      byte[] jobByteArray = PersistenceUtil.Serialize(this.ItemJob, out usedTypes);
+
+      JobData jobData = new JobData() {
+        JobId = job.Id,
+        Data = jobByteArray
+      };
+
+      PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
+
+      return jobData;
     }
 
@@ -239 +267 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    private void RegisterJobEvents() {
+      if (job != null)
+        job.PropertyChanged += new PropertyChangedEventHandler(job_PropertyChanged);
+    }
+
+    private void DeregisterJobEvents() {
+      if (job != null)
+        job.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(job_PropertyChanged);
+    }
+
+    private void job_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      if (e.PropertyName == "State") {
+        itemJobDownloaded = false;
+      }
+    }
     #endregion
-    
+
     /// <summary>
     /// Returns a list of HiveJobs including this and all its child-jobs recursively
@@ -326 +370 @@
       } else {
         ServiceLocator.Instance.CallHiveService(s => s.PauseJob(this.job.Id));
-      }      
+      }
     }
 
@@ -343 +387 @@
         JobData jobData = new JobData();
         jobData.JobId = this.job.Id;
-        jobData.Data = PersistenceUtil.Serialize(this.jobItem);
+        jobData.Data = PersistenceUtil.Serialize(this.itemJob);
         service.UpdateJobData(this.Job, jobData);
         service.RestartJob(this.job.Id);
@@ -350 +394 @@
       });
     }
-    
+
     public ICollection<IItemTreeNodeAction<HiveJob>> Actions {
       get {
@@ -364 +408 @@
   public class HiveJob<T> : HiveJob where T : ItemJob {
 
-    public new T JobItem {
-      get { return (T)base.JobItem; }
-      internal set { base.JobItem = value; }
+    public new T ItemJob {
+      get { return (T)base.ItemJob; }
+      internal set { base.ItemJob = value; }
     }
 
     #region Constructors and Cloning
     public HiveJob() : base() { }
+    public HiveJob(T itemJob) : base(itemJob, true) { }
     protected HiveJob(HiveJob original, Cloner cloner)
       : base(original, cloner) {